annotate lisp/textmodes/two-column.el @ 41109:0bcf2d7f0112

(values, values-list, multiple-value-list, multiple-value-apply, nth-value): Use defsubst rather than defalias, to get better doc strings.
author Richard M. Stallman <rms@gnu.org>
date Thu, 15 Nov 2001 23:57:43 +0000
parents ef399b9ffc2b
children 27b622ce6604 d7ddb3e565de
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
1 ;;; two-column.el --- minor mode for editing of two-column text
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
2
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
3 ;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
4
23869
8d2bb5d1416a Update comment.
Karl Heuer <kwzh@gnu.org>
parents: 22303
diff changeset
5 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
6 ;; Adapted-By: ESR, Daniel Pfeiffer
38697
a19197c6442f Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents: 38436
diff changeset
7 ;; Keywords: wp
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
8
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33786
diff changeset
9 ;; This file is part of GNU Emacs.
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33786
diff changeset
10
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
11 ;; Esperanto: English:
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
12
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
13 ;; ^Ci dosiero estas ero de GNU Emacs. This file is part of GNU Emacs.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
14
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
15 ;; GNU Emacs estas libera programaro; GNU Emacs is free software; you can
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
16 ;; vi povas disdoni ^gin kaj/a^u modifi redistribute it and/or modify it
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
17 ;; ^gin sub la kondi^coj de la GNU under the terms of the GNU General
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
18 ;; ^Generala Publika Licenco kiel pub- Public License as published by the
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
19 ;; likigita far la Liberprogramara Fon- Free Software Foundation; either
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
20 ;; da^jo; a^u eldono 2a, a^u (la^u via version 2, or (at your option) any
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
21 ;; elekto) ajna posta eldono. later version.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
22
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
23 ;; GNU Emacs estas disdonata en la GNU Emacs is distributed in the hope
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
24 ;; espero ke ^gi estos utila, sed SEN that it will be useful, but WITHOUT
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
25 ;; IA GARANTIO; sen e^c la implicita ANY WARRANTY; without even the
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
26 ;; garantio de VENDEBLECO a^u PRETECO implied warranty of MERCHANTABILITY
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
27 ;; POR DETERMINITA CELO. Vidu la GNU or FITNESS FOR A PARTICULAR PURPOSE.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
28 ;; ^Generala Publika Licenco por plenaj See the GNU General Public License
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
29 ;; detaloj. for more details.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
30
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
31 ;; Vi devus ricevinti kopion de la GNU You should have received a copy of
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
32 ;; ^Generala Publika Licenco kune kun the GNU General Public License along
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
33 ;; GNU Emacs; vidu la dosieron COPYING. with GNU Emacs; see the file
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
34 ;; Alikaze skribu al la COPYING. If not, write to the
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
35
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
36 ;; Free Software Foundation, 59 Temple Place - Suite 330
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
37 ;; Boston, MA 02111-1307, USA.
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
38
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33786
diff changeset
39 ;;; Commentary:
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
40
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
41 ;;; Komentario: Commentary:
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
42
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
43 ;; Tiu programaro ebligas vin redakti This package gives you the ability
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
44 ;; dukolumnan tekston. to edit text in a two-column format.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
45
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
46
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
47 ;; Vi havas tri eblecojn por eki tiun You have three ways to start up this
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
48 ;; mal^cefan modalon. ^Ciu donas al vi minor mode. Each gives you a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
49 ;; horizontale disigatan fenestron, si- horizontally split window similar to
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
50 ;; milan al fina apareco de via teksto: the final outcome of your text:
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
51
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
52
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
53 ;; f2 2 asocias novan bufron nomatan associates a new buffer called
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
54 ;; C-x 6 2 same, sed kun 2C/ anta^u. the same, but with 2C/
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
55 ;; prepended.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
56
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
57 ;; f2 b asocias alian bufron. Vi povas associates another buffer.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
58 ;; C-x 6 b anka^u asocii dataron, se vi This can be used to associate a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
59 ;; ^jus anta^ue faris C-x C-f. file if you just did C-x C-f.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
60
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
61 ;; f2 s disigas jam dukolumnan tekston splits a two-column text into
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
62 ;; C-x 6 s en du bufroj ekde la nuna two buffers from the current
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
63 ;; linio, kaj je la nuna kolumno. line and at the current column.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
64 ;; La anta^uaj signoj (ofte The preceding characters (often
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
65 ;; tabeligilo a^u |) estas la tab or |) are the column
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
66 ;; kolumna disiganto. Linioj kiuj separator. Lines that don't
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
67 ;; ne enhavas ilin ne estas have them won't be separated.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
68 ;; disigitaj. Kiel la kvara kaj Like the fourth and fifth line
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
69 ;; la kvina linio se vi disigas if you split this file from
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
70 ;; ^ci dataron ekde la unua angla the first english word.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
71 ;; vorto.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
72
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
73 ;; Se vi volas meti longajn liniojn If you include long lines, i.e which
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
74 ;; (ekz. programerojn) en la kunigotan will span both columns (eg. source
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
75 ;; tekston, ili devas esti en la code), they should be in what will
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
76 ;; estonte unua kolumno. La alia devas be the first column, with the
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
77 ;; havi vakajn linion apud ili. associated buffer having empty lines
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
78 ;; next to them.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
79
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
80 ;; Averto: en Emacs kiam vi ^san^gas la Attention: in Emacs when you change
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
81 ;; ^cefan modalon, la mal^cefaj modaloj the major mode, the minor modes are
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
82 ;; estas anka^u elmemorigitaj. Tiu- also purged from memory. In that
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
83 ;; okaze vi devas religi la du bufrojn case you must reassociate the two
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
84 ;; per iu C-x 6-ordono, ekz. C-x 6 b. buffers with any C-x 6-command, e.g.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
85 ;; C-x 6 b.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
86
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
87 ;; Kiam vi estos kontenta de la When you have edited both buffers to
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
88 ;; rezulto, vi kunmetos la du kolumnojn your content, you merge them with
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
89 ;; per C-x 6 1. Se vi poste vidas C-x 6 1. If you then see a problem,
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
90 ;; problemon, vi neniigu la kunmeton you undo the merge with C-x u and
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
91 ;; per C-x u kaj plue modifu la du continue to edit the two buffers.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
92 ;; bufrojn. Kiam vi ne plu volas tajpi When you no longer want to edit in
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
93 ;; dukolumne, vi eliru el la mal^cefa two columns, you turn off the minor
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
94 ;; modalo per C-x 6 d. mode with C-x 6 d.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
95
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
96
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
97 ;; Aldone al dukolumna redaktado, ek- In addition to two-column editing of
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
98 ;; zemple por skribi dulingvan tekston text, for example for writing a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
99 ;; flank-al-flanke kiel ^ci tiu, aliaj bilingual text side-by-side as shown
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
100 ;; interesaj uzoj trovitas por tiu mal- here, other interesting uses have
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
101 ;; ^cefa modalo: been found for this minor mode:
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
102
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
103 ;; Vi povas disigi la kolumnojn per {+} You can separate the columns with
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
104 ;; ajna pla^ca ^ceno starigante {+} any string that pleases you, by
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
105 ;; `2C-separator'. Ekzemple "{+} " {+} setting `2C-separator'. For example
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
106 ;; por amuzi^gi. f2 s a^u C-x 6 s {+} "{+} " if you'd like to have fun.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
107 ;; traktas tiujn kun prefiksa {+} f2 s or C-x 6 s handles these with a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
108 ;; argumento kiu signifas la longon {+} prefix argument that means the
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
109 ;; de tia ^ceno. {+} desired length of such a string.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
110
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
111
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
112 ;; Programistoj eble ^satus la eblecon Programmers might like the ability
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
113 ;; forspliti la komentarian kolumnon de to split off the comment column of a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
114 ;; dosiero kiel la sekvanta. Vi povas file that looks like the following.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
115 ;; rearan^gigi la paragrafon. La pro- You can fill-paragraph the comment.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
116 ;; blemo estas ke koda^jo tuj lar- The problem is, code quickly gets
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
117 ;; ^gi^gas, tiel ke vi bezonas pli rather wide, so you need to use a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
118 ;; mallar^gan komentarian kolumnon. narrower comment column. Code lines
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
119 ;; Koda^jaj linioj tra `comment-column' that reach beyond `comment-column'
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
120 ;; ne problemas, krom ke vi ne vidos are no problem, except that you
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
121 ;; iliajn finojn dum redaktado. won't see their end during editing.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
122
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
123
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
124 ;; BEGIN -- This is just some meaningless
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
125 ;; FOR i IN 1..10 LOOP -- code in Ada, that runs foobar
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
126 ;; foobar( i ); -- once for each argument from one
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
127 ;; END LOOP; -- to ten, and then we're already
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
128 ;; END; -- through with it.
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
129
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
130 ;; Pli bone ankora^u, vi povas pozici- Better yet, you can put the point
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
131 ;; i^gi anta^u "This", tajpi M-3 f2 s before "This", type M-3 f2 s
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
132 ;; kiu igas "-- " la separigilon inter which makes "-- " the separator
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
133 ;; senkomentaria Ada bufro kaj nur- between a no-comments Ada buffer,
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
134 ;; teksta komentaria bufro. Kiam vi and a plain text comment buffer.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
135 ;; denove kuni^gos ilin, ^ciu nevaka When you put them back together,
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
136 ;; linio de l' dua kolumno denove every non-empty line of the 2nd
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
137 ;; anta^uhavos "-- ". column will again be preceded by
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
138 ;; "-- ".
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
139
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
140
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
141 ;;; Code:
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
142
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
143
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
144 ;; Lucid patch
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
145 (or (fboundp 'frame-width)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
146 (fset 'frame-width 'screen-width))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
147
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
148
1245
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
149 ;;;;; Set up keymap ;;;;;
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
150
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
151 (defvar 2C-mode-map
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
152 (let ((map (make-sparse-keymap)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
153 (define-key map "2" '2C-two-columns)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
154 (define-key map [f2] '2C-two-columns)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
155 (define-key map "b" '2C-associate-buffer)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
156 (define-key map "s" '2C-split)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
157 map)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
158 "Keymap for commands for setting up two-column mode.")
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
159
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
160
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
161
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
162 ;;;###autoload (autoload '2C-command "two-column" () t 'keymap)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
163 (fset '2C-command 2C-mode-map)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
164
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
165 ;; This one is for historical reasons and simple keyboards, it is not
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
166 ;; at all mnemonic. All usual sequences containing 2 were used, and
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
167 ;; f2 could not be set up in a standard way under Emacs 18.
22303
d6cc394c34b4 Bind f2 and C-x 6 prefixes
Karl Heuer <kwzh@gnu.org>
parents: 17977
diff changeset
168 ;;;###autoload (global-set-key "\C-x6" '2C-command)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
169
22303
d6cc394c34b4 Bind f2 and C-x 6 prefixes
Karl Heuer <kwzh@gnu.org>
parents: 17977
diff changeset
170 ;;;###autoload (global-set-key [f2] '2C-command)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
171
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
172
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
173 (defvar 2C-minor-mode-map
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
174 (let ((map (make-sparse-keymap)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
175 (define-key map "1" '2C-merge)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
176 (define-key map "d" '2C-dissociate)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
177 (define-key map "o" '2C-associated-buffer)
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
178 (define-key map "\^m" '2C-newline)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
179 (define-key map "|" '2C-toggle-autoscroll)
13388
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
180 (define-key map "{" '2C-shrink-window-horizontally)
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
181 (define-key map "}" '2C-enlarge-window-horizontally)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
182 map)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
183 "Keymap for commands for use in two-column mode.")
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
184
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
185
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
186 (setq minor-mode-map-alist
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
187 (cons (cons '2C-mode
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
188 (let ((map (make-sparse-keymap)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
189 (substitute-key-definition '2C-command 2C-minor-mode-map
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
190 map (current-global-map))
13388
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
191 (substitute-key-definition 'enlarge-window-horizontally
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
192 '2C-enlarge-window-horizontally
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
193 map (current-global-map))
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
194 (substitute-key-definition 'shrink-window-horizontally
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
195 '2C-shrink-window-horizontally
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
196 map (current-global-map))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
197 map))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
198 minor-mode-map-alist))
1245
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
199
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
200 ;;;;; variable declarations ;;;;;
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
201
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
202 (defgroup two-column nil
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
203 "Minor mode for editing of two-column text"
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
204 :prefix "2C-"
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
205 :group 'frames)
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
206
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
207
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
208 ;; Markers seem to be the only buffer-id not affected by renaming a buffer.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
209 ;; This nevertheless loses when a buffer is killed. The variable-name is
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
210 ;; required by `describe-mode'.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
211 (defvar 2C-mode nil
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
212 "Marker to the associated buffer, if non-nil.")
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
213 (make-variable-buffer-local '2C-mode)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
214 (put '2C-mode 'permanent-local t)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
215
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
216
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
217
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
218 (setq minor-mode-alist (cons '(2C-mode " 2C") minor-mode-alist))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
219
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
220
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
221
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
222 ;; rearranged, so that the pertinent info will show in 40 columns
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
223 (defcustom 2C-mode-line-format
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
224 '("-%*- %15b --" (-3 . "%p") "--%[(" mode-name
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
225 minor-mode-alist "%n" mode-line-process ")%]%-")
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
226 "*Value of mode-line-format for a buffer in two-column minor mode."
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
227 :type 'sexp
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
228 :group 'two-column)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
229
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
230
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
231 (defcustom 2C-other-buffer-hook 'text-mode
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
232 "*Hook run in new buffer when it is associated with current one."
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
233 :type 'function
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
234 :group 'two-column)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
235
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
236
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
237 (defcustom 2C-separator ""
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
238 "*A string inserted between the two columns when merging.
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
239 This gets set locally by \\[2C-split]."
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
240 :type 'string
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
241 :group 'two-column)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
242 (put '2C-separator 'permanent-local t)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
243
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
244
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
245
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
246 (defcustom 2C-window-width 40
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
247 "*The width of the first column. (Must be at least `window-min-width')
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
248 This value is local for every buffer that sets it."
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
249 :type 'integer
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
250 :group 'two-column)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
251 (make-variable-buffer-local '2C-window-width)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
252 (put '2C-window-width 'permanent-local t)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
253
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
254
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
255
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
256 (defcustom 2C-beyond-fill-column 4
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
257 "*Base for calculating `fill-column' for a buffer in two-column minor mode.
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
258 The value of `fill-column' becomes `2C-window-width' for this buffer
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
259 minus this value."
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
260 :type 'integer
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
261 :group 'two-column)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
262
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
263
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
264
17430
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
265 (defcustom 2C-autoscroll t
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
266 "If non-nil, Emacs attempts to keep the two column's buffers aligned."
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
267 :type 'boolean
de68258fef5f Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16421
diff changeset
268 :group 'two-column)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
269
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
270
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
271
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
272 (defvar 2C-autoscroll-start nil)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
273 (make-variable-buffer-local '2C-autoscroll-start)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
274
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
275 ;;;;; base functions ;;;;;
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
276
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
277 ;; The access method for the other buffer. This tries to remedy against
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
278 ;; lost local variables and lost buffers.
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
279 (defun 2C-other (&optional req)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
280 (or (if 2C-mode
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
281 (or (prog1
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
282 (marker-buffer 2C-mode)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
283 (setq mode-line-format 2C-mode-line-format))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
284 ;; The associated buffer somehow got killed.
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
285 (progn
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
286 ;; The other variables may later be useful if the user
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
287 ;; reestablishes the association.
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
288 (kill-local-variable '2C-mode)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
289 (kill-local-variable 'mode-line-format)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
290 nil)))
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33786
diff changeset
291 (if req (error "You must first set two-column minor mode"))))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
292
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
293
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
294
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
295 ;; function for setting up two-column minor mode in a buffer associated
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
296 ;; with the buffer pointed to by the marker other.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
297 (defun 2C-mode (other)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
298 "Minor mode for independently editing two columns.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
299 This is set up for two associated buffers by the three commands bound
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
300 to \\[2C-two-columns] , \\[2C-associate-buffer] and \\[2C-split].
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
301 Turning on two-column mode calls the value of the variable `2C-mode-hook',
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
302 if that value is non-nil.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
303
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
304 These buffers can be edited separately, for example with `fill-paragraph'.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
305 If you want to disable parallel scrolling temporarily, use \\[2C-toggle-autoscroll] .
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
306
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
307 If you include long lines, i.e which will span both columns (eg.
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
308 source code), they should be in what will be the first column, with
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
309 the associated buffer having empty lines next to them.
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
310
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
311 Potential uses are writing bilingual texts, or editing the comments of a
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
312 source code. See the file lisp/two-column.el for detailed examples.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
313
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
314 You have the following commands at your disposal:
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
315
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
316 \\[2C-two-columns] Rearrange screen with current buffer first
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
317 \\[2C-associate-buffer] Reassociate buffer after changing major mode
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
318 \\[shrink-window-horizontally], \\[enlarge-window-horizontally] Shrink, enlarge current column
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
319 \\[2C-associated-buffer] Switch to associated buffer at same point
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
320 \\[2C-newline] Insert newline(s) in both buffers at same point
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
321 \\[2C-merge] Merge both buffers
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
322 \\[2C-dissociate] Dissociate the two buffers
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
323
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
324 These keybindings can be customized in your ~/.emacs by `2C-mode-map',
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
325 `2C-minor-mode-map' and by binding `2C-command' to some prefix.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
326
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
327 The appearance of the screen can be customized by the variables
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
328 `2C-window-width', `2C-beyond-fill-column', `2C-mode-line-format' and
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
329 `truncate-partial-width-windows'."
12934
7fd541abf2af (2C-mode): Use make-local-hook and add-hook.
Richard M. Stallman <rms@gnu.org>
parents: 12739
diff changeset
330 (add-hook 'post-command-hook '2C-autoscroll nil t)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
331 (setq fill-column (- 2C-window-width
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
332 2C-beyond-fill-column)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
333 mode-line-format 2C-mode-line-format
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
334 2C-mode other)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
335 (run-hooks '2C-mode-hook))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
336
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
337
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
338
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
339 ;;;###autoload
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
340 (defun 2C-two-columns (&optional buffer)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
341 "Split current window vertically for two-column editing.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
342 When called the first time, associates a buffer with the current
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
343 buffer in two-column minor mode (see \\[describe-mode] ).
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
344 Runs `2C-other-buffer-hook' in the new buffer.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
345 When called again, restores the screen layout with the current buffer
16421
65d4b4b2e954 (2C-two-columns): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13388
diff changeset
346 first and the associated buffer to its right."
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
347 (interactive "P")
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
348 ;; first go to full width, so that we can certainly split into two windows
1245
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
349 (if (< (window-width) (frame-width))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
350 (enlarge-window 99999 t))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
351 (split-window-horizontally
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
352 (max window-min-width (min 2C-window-width
1245
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
353 (- (frame-width) window-min-width))))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
354 (if (2C-other)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
355 (progn
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
356 (other-window 1)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
357 (switch-to-buffer (2C-other))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
358 (other-window -1)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
359 (if 2C-autoscroll
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
360 (2C-toggle-autoscroll t)))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
361
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
362 (2C-mode (prog1 (point-marker)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
363 (other-window 1)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
364 (switch-to-buffer
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
365 (or buffer
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
366 (generate-new-buffer (concat "2C/" (buffer-name)))))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
367 (or buffer
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
368 (run-hooks '2C-other-buffer-hook))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 23869
diff changeset
369
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
370 (2C-mode (prog1 (point-marker)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
371 (other-window -1)))))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
372
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
373
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
374
1904
cca15d76f3e5 * two-column.el: Add autoloads for the functions defined in
Jim Blandy <jimb@redhat.com>
parents: 1245
diff changeset
375 ;;;###autoload
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
376 (defun 2C-associate-buffer ()
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
377 "Associate another buffer with this one in two-column minor mode.
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
378 Can also be used to associate a just previously visited file, by
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
379 accepting the proposed default buffer.
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
380
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
381 \(See \\[describe-mode] .)"
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
382 (interactive)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
383 (let ((b1 (current-buffer))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
384 (b2 (or (2C-other)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
385 (read-buffer "Associate buffer: " (other-buffer)))))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
386 (save-excursion
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
387 (setq 2C-mode nil)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
388 (set-buffer b2)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
389 (and (2C-other)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
390 (not (eq b1 (2C-other)))
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33786
diff changeset
391 (error "Buffer already associated with buffer `%s'"
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
392 (buffer-name (2C-other))))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
393 (setq b1 (and (assq '2C-window-width (buffer-local-variables))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
394 2C-window-width)))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
395 ; if other buffer has a local width, adjust here too
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
396 (if b1 (setq 2C-window-width (- (frame-width) b1)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
397 (2C-two-columns b2)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
398
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
399
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
400
1904
cca15d76f3e5 * two-column.el: Add autoloads for the functions defined in
Jim Blandy <jimb@redhat.com>
parents: 1245
diff changeset
401 ;;;###autoload
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
402 (defun 2C-split (arg)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
403 "Split a two-column text at point, into two buffers in two-column minor mode.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
404 Point becomes the local value of `2C-window-width'. Only lines that
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
405 have the ARG same preceding characters at that column get split. The
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
406 ARG preceding characters without any leading whitespace become the local
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
407 value for `2C-separator'. This way lines that continue across both
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
408 columns remain untouched in the first buffer.
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
409
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
410 This function can be used with a prototype line, to set up things. You
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
411 write the first line of each column and then split that line. E.g.:
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
412
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
413 First column's text sSs Second column's text
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
414 \\___/\\
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
415 / \\
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
416 5 character Separator You type M-5 \\[2C-split] with the point here.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
417
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
418 \(See \\[describe-mode] .)"
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
419 (interactive "*p")
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
420 (and (2C-other)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
421 (if (y-or-n-p (concat "Overwrite associated buffer `"
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
422 (buffer-name (2C-other))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
423 "'? "))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
424 (save-excursion
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
425 (set-buffer (2C-other))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
426 (erase-buffer))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
427 (signal 'quit nil)))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
428 (let ((point (point))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
429 ; make next-line always come back to same column
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
430 (goal-column (current-column))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
431 ; a counter for empty lines in other buffer
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
432 (n (1- (count-lines (point-min) (point))))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
433 chars other)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
434 (save-excursion
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
435 (backward-char arg)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
436 (setq chars (buffer-substring (point) point))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
437 (skip-chars-forward " \t" point)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
438 (make-local-variable '2C-separator)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
439 (setq 2C-separator (buffer-substring (point) point)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
440 2C-window-width (current-column)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
441 (2C-two-columns)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
442 (setq other (2C-other))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
443 ; now we're ready to actually split
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
444 (save-excursion
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
445 (while (not (eobp))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
446 (if (not (and (= (current-column) goal-column)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
447 (string= chars
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
448 (buffer-substring (point)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
449 (save-excursion
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
450 (backward-char arg)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
451 (point))))))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
452 (setq n (1+ n))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
453 (setq point (point))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
454 (backward-char arg)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
455 (skip-chars-backward " \t")
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
456 (delete-region point (point))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
457 (setq point (point))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
458 (insert-char ?\n n)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
459 (append-to-buffer other point (progn (end-of-line)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
460 (if (eobp)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
461 (point)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
462 (1+ (point)))))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
463 (delete-region point (point))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
464 (setq n 0))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
465 (next-line 1)))))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
466
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
467
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
468
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
469
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
470 (defun 2C-dissociate ()
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
471 "Turn off two-column minor mode in current and associated buffer.
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
472 If the associated buffer is unmodified and empty, it is killed."
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
473 (interactive)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
474 (let ((buffer (current-buffer)))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
475 (save-excursion
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
476 (and (2C-other)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
477 (set-buffer (2C-other))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
478 (or (not (2C-other))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
479 (eq buffer (2C-other)))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
480 (if (and (not (buffer-modified-p))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
481 (eobp) (bobp))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
482 (kill-buffer nil)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
483 (kill-local-variable '2C-mode)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
484 (kill-local-variable '2C-window-width)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
485 (kill-local-variable '2C-separator)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
486 (kill-local-variable 'mode-line-format)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
487 (kill-local-variable 'fill-column))))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
488 (kill-local-variable '2C-mode)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
489 (kill-local-variable '2C-window-width)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
490 (kill-local-variable '2C-separator)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
491 (kill-local-variable 'mode-line-format)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
492 (kill-local-variable 'fill-column)))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
493
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
494
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
495
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
496 ;; this doesn't use yank-rectangle, so that the first column can
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
497 ;; contain long lines
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
498 (defun 2C-merge ()
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
499 "Merges the associated buffer with the current buffer.
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
500 They get merged at the column, which is the value of `2C-window-width',
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
501 i.e. usually at the vertical window separator. This separator gets
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
502 replaced with white space. Beyond that the value of `2C-separator' gets
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
503 inserted on merged lines. The two columns are thus pasted side by side,
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
504 in a single text. If the other buffer is not displayed to the left of
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
505 this one, then this one becomes the left column.
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
506
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
507 If you want `2C-separator' on empty lines in the second column,
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
508 you should put just one space in them. In the final result, you can strip
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 23869
diff changeset
509 off trailing spaces with \\[delete-trailing-whitespace]."
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
510 (interactive)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
511 (and (> (car (window-edges)) 0) ; not touching left edge of screen
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
512 (eq (window-buffer (previous-window))
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
513 (2C-other t))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
514 (other-window -1))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
515 (save-excursion
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
516 (let ((b1 (current-buffer))
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
517 (b2 (2C-other t))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
518 string)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
519 (goto-char (point-min))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
520 (set-buffer b2)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
521 (goto-char (point-min))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
522 (while (not (eobp))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
523 (setq string (buffer-substring (point)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
524 (progn (end-of-line) (point))))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
525 (or (eobp)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
526 (forward-char)) ; next line
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
527 (set-buffer b1)
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
528 (if (string= string "")
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
529 ()
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
530 (end-of-line)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
531 (indent-to-column 2C-window-width)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
532 (insert 2C-separator string))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
533 (next-line 1) ; add one if necessary
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
534 (set-buffer b2))))
1245
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
535 (if (< (window-width) (frame-width))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
536 (enlarge-window 99999 t)))
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
537
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
538 ;;;;; utility functions ;;;;;
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
539
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
540 (defun 2C-associated-buffer ()
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
541 "Switch to associated buffer."
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
542 (interactive)
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
543 (let ((line (+ (count-lines (point-min) (point))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
544 (if (bolp) 1 0)))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
545 (col (if (eolp) (if (bolp) 0) (current-column))))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
546 (if (get-buffer-window (2C-other t))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
547 (select-window (get-buffer-window (2C-other)))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
548 (switch-to-buffer (2C-other)))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
549 (newline (goto-line line))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
550 (if col
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
551 (move-to-column col)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
552 (end-of-line 1))))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
553
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
554 (defun 2C-newline (arg)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
555 "Insert ARG newlines in both buffers."
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
556 (interactive "P")
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
557 (save-window-excursion
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
558 (2C-associated-buffer)
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
559 (newline arg))
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
560 (newline arg))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
561
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
562 (defun 2C-toggle-autoscroll (arg)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
563 "Toggle autoscrolling, or set it iff prefix ARG is non-nil and positive.
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
564 When autoscrolling is turned on, this also realigns the two buffers."
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
565 (interactive "P")
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
566 ;(sit-for 0)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
567 (setq 2C-autoscroll-start (window-start))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
568 (if (setq 2C-autoscroll (if arg
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
569 (>= (prefix-numeric-value arg) 0)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
570 (not 2C-autoscroll)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
571 (select-window
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
572 (prog1 (selected-window)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
573 (message "Autoscrolling is on.")
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
574 (setq arg (count-lines (point-min) (window-start)))
12739
ae2e8daffa31 (2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents: 12506
diff changeset
575 (if (get-buffer-window (2C-other t))
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
576 (progn
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
577 (select-window (get-buffer-window (2C-other)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
578 (setq arg (- arg (count-lines (point-min) (window-start))))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
579 ;; make sure that other buffer has enough lines
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
580 (save-excursion
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
581 (insert-char ?\n
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
582 (- arg (count-lines (window-start)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
583 (goto-char (point-max)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
584 -1)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
585 (scroll-up arg)))))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
586 (message "Autoscrolling is off.")))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
587
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
588
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
589
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
590 (defun 2C-autoscroll ()
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
591 (if 2C-autoscroll
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
592 ;; catch a mouse scroll on non-selected scrollbar
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
593 (select-window
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
594 (prog1 (selected-window)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
595 (and (consp last-command-char)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
596 (not (eq (selected-window)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
597 (car (car (cdr last-command-char)))))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
598 (select-window (car (car (cdr last-command-char)))))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
599 ;; In some cases scrolling causes an error, but post-command-hook
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
600 ;; shouldn't, and should always stay in the original window
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
601 (condition-case ()
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
602 (and (or 2C-autoscroll-start (2C-toggle-autoscroll t) nil)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
603 (/= (window-start) 2C-autoscroll-start)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
604 (2C-other)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
605 (get-buffer-window (2C-other))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
606 (let ((lines (count-lines (window-start)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
607 2C-autoscroll-start)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
608 (if (< (window-start) 2C-autoscroll-start)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
609 (setq lines (- lines)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
610 (setq 2C-autoscroll-start (window-start))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
611 (select-window (get-buffer-window (2C-other)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
612 ;; make sure that other buffer has enough lines
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
613 (save-excursion
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
614 (insert-char
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
615 ?\n (- lines (count-lines (window-start)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
616 (goto-char (point-max)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
617 -1)))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
618 (scroll-up lines)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
619 (setq 2C-autoscroll-start (window-start))))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
620 (error))))))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
621
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
622
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
623
13388
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
624 (defun 2C-enlarge-window-horizontally (arg)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
625 "Make current window ARG columns wider."
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
626 (interactive "p")
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
627 (enlarge-window arg t)
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
628 (and (2C-other)
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
629 (setq 2C-window-width (+ 2C-window-width arg))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
630 (set-buffer (2C-other))
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
631 (setq 2C-window-width (- 2C-window-width arg))))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
632
13388
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
633 (defun 2C-shrink-window-horizontally (arg)
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
634 "Make current window ARG columns narrower."
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
635 (interactive "p")
13388
af2bb7490ca9 (minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents: 12934
diff changeset
636 (2C-enlarge-window-horizontally (- arg)))
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
637
12506
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
638
5dc02bbeb4be Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
639
1245
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
640 (provide 'two-column)
f8a5da3d18e8 Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents: 923
diff changeset
641
809
8a0066235d56 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
642 ;;; two-column.el ends here