Mercurial > emacs
annotate lisp/textmodes/two-column.el @ 72203:eddf5f0ed3c9
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 121-122)
- Update from CVS
2006-07-28 Reiner Steib <Reiner.Steib@gmx.de>
* etc/GNUS-NEWS: Regenerate from Oort Gnus node in texi/gnus.texi using
texi/gnus-news.el of the trunk.
2006-07-28 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnheader.el (nnheader-insert-head): Make it work with Mac as well.
2006-07-27 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnheader.el (nnheader-insert-head): Make it work even if the file
uses CRLF for the line-break code.
2006-07-28 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Mention that the Lisp files are now installed
in .../site-lisp/gnus/ by default.
[ From gnus-news.texi in the trunk. ]
2006-07-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (MIME Commands): Additions for yEnc.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-375
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 31 Jul 2006 09:40:13 +0000 |
parents | 067115a6e738 |
children | 3fc5212fe32a c5406394f567 |
rev | line source |
---|---|
809 | 1 ;;; two-column.el --- minor mode for editing of two-column text |
2 | |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, |
68648
067115a6e738
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64751
diff
changeset
|
4 ;; 2005, 2006 Free Software Foundation, Inc. |
809 | 5 |
23869 | 6 ;; 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
|
7 ;; Adapted-By: ESR, Daniel Pfeiffer |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
38436
diff
changeset
|
8 ;; Keywords: wp |
809 | 9 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33786
diff
changeset
|
10 ;; This file is part of GNU Emacs. |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33786
diff
changeset
|
11 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
12 ;; Esperanto: English: |
809 | 13 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
14 ;; ^Ci dosiero estas ero de GNU Emacs. This file is part of GNU Emacs. |
809 | 15 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
16 ;; 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
|
17 ;; 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
|
18 ;; ^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
|
19 ;; ^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
|
20 ;; 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
|
21 ;; 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
|
22 ;; elekto) ajna posta eldono. later version. |
809 | 23 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
24 ;; 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
|
25 ;; 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
|
26 ;; 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
|
27 ;; 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
|
28 ;; 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
|
29 ;; ^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
|
30 ;; detaloj. for more details. |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
31 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
32 ;; 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
|
33 ;; ^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
|
34 ;; 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
|
35 ;; Alikaze skribu al la COPYING. If not, write to the |
809 | 36 |
64084 | 37 ;; Free Software Foundation, 51 Franklin Street, Fifth Floor |
38 ;; Boston, MA 02110-1301, USA. | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
39 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33786
diff
changeset
|
40 ;;; Commentary: |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
41 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
42 ;;; Komentario: Commentary: |
809 | 43 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
44 ;; 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
|
45 ;; 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
|
46 |
809 | 47 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
48 ;; 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
|
49 ;; 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
|
50 ;; 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
|
51 ;; milan al fina apareco de via teksto: the final outcome of your text: |
809 | 52 |
53 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
54 ;; 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
|
55 ;; 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
|
56 ;; prepended. |
809 | 57 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
58 ;; 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
|
59 ;; 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
|
60 ;; ^jus anta^ue faris C-x C-f. file if you just did C-x C-f. |
809 | 61 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
62 ;; 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
|
63 ;; 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
|
64 ;; 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
|
65 ;; 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
|
66 ;; 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
|
67 ;; 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
|
68 ;; 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
|
69 ;; 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
|
70 ;; 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
|
71 ;; ^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
|
72 ;; vorto. |
809 | 73 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
74 ;; 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
|
75 ;; (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
|
76 ;; 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
|
77 ;; 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
|
78 ;; 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
|
79 ;; next to them. |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
80 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
81 ;; 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
|
82 ;; ^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
|
83 ;; 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
|
84 ;; 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
|
85 ;; 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
|
86 ;; C-x 6 b. |
809 | 87 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
88 ;; 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
|
89 ;; 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
|
90 ;; 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
|
91 ;; 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
|
92 ;; 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
|
93 ;; 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
|
94 ;; 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
|
95 ;; 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
|
96 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
97 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
98 ;; 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
|
99 ;; 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
|
100 ;; 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
|
101 ;; 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
|
102 ;; ^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
|
103 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
104 ;; 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
|
105 ;; 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
|
106 ;; `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
|
107 ;; 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
|
108 ;; 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
|
109 ;; 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
|
110 ;; 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
|
111 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
112 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
113 ;; 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
|
114 ;; 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
|
115 ;; 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
|
116 ;; 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
|
117 ;; 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
|
118 ;; ^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
|
119 ;; 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
|
120 ;; 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
|
121 ;; 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
|
122 ;; 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
|
123 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
124 |
809 | 125 ;; BEGIN -- This is just some meaningless |
126 ;; 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
|
127 ;; foobar( i ); -- once for each argument from one |
809 | 128 ;; END LOOP; -- to ten, and then we're already |
129 ;; END; -- through with it. | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
130 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
131 ;; 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
|
132 ;; 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
|
133 ;; 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
|
134 ;; 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
|
135 ;; 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
|
136 ;; 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
|
137 ;; 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
|
138 ;; 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
|
139 ;; "-- ". |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
140 |
809 | 141 |
142 ;;; Code: | |
143 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
144 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
145 ;; Lucid patch |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
146 (or (fboundp 'frame-width) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
147 (fset 'frame-width 'screen-width)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
148 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
149 |
1245
f8a5da3d18e8
Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents:
923
diff
changeset
|
150 ;;;;; Set up keymap ;;;;; |
809 | 151 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
152 (defvar 2C-mode-map |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
153 (let ((map (make-sparse-keymap))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
154 (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
|
155 (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
|
156 (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
|
157 (define-key map "s" '2C-split) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
158 map) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
159 "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
|
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 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
163 ;;;###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
|
164 (fset '2C-command 2C-mode-map) |
809 | 165 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
166 ;; 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
|
167 ;; 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
|
168 ;; f2 could not be set up in a standard way under Emacs 18. |
22303 | 169 ;;;###autoload (global-set-key "\C-x6" '2C-command) |
809 | 170 |
22303 | 171 ;;;###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
|
172 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
173 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
174 (defvar 2C-minor-mode-map |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
175 (let ((map (make-sparse-keymap))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
176 (define-key map "1" '2C-merge) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
177 (define-key map "d" '2C-dissociate) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
178 (define-key map "o" '2C-associated-buffer) |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
179 (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
|
180 (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
|
181 (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
|
182 (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
|
183 map) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
184 "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
|
185 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
186 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
187 (setq minor-mode-map-alist |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
188 (cons (cons '2C-mode |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
189 (let ((map (make-sparse-keymap))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
190 (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
|
191 map (current-global-map)) |
13388
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
192 (substitute-key-definition 'enlarge-window-horizontally |
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
193 '2C-enlarge-window-horizontally |
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
194 map (current-global-map)) |
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
195 (substitute-key-definition 'shrink-window-horizontally |
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
196 '2C-shrink-window-horizontally |
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
197 map (current-global-map)) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
198 map)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
199 minor-mode-map-alist)) |
1245
f8a5da3d18e8
Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents:
923
diff
changeset
|
200 |
f8a5da3d18e8
Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents:
923
diff
changeset
|
201 ;;;;; variable declarations ;;;;; |
809 | 202 |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
203 (defgroup two-column nil |
64062
50af47b41b9c
(two-column): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
204 "Minor mode for editing of two-column text." |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
205 :prefix "2C-" |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
206 :group 'frames) |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
207 |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
208 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
209 ;; 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
|
210 ;; 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
|
211 ;; required by `describe-mode'. |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
212 (defvar 2C-mode nil |
809 | 213 "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
|
214 (make-variable-buffer-local '2C-mode) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
215 (put '2C-mode 'permanent-local t) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
216 |
809 | 217 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
218 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
219 (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
|
220 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
221 |
809 | 222 |
223 ;; 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
|
224 (defcustom 2C-mode-line-format |
809 | 225 '("-%*- %15b --" (-3 . "%p") "--%[(" mode-name |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
226 minor-mode-alist "%n" mode-line-process ")%]%-") |
51963
27b622ce6604
(2C-mode-line-format): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
39892
diff
changeset
|
227 "*Value of `mode-line-format' for a buffer in two-column minor mode." |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
228 :type 'sexp |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
229 :group 'two-column) |
809 | 230 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
231 |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
232 (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
|
233 "*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
|
234 :type 'function |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
235 :group 'two-column) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
236 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
237 |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
238 (defcustom 2C-separator "" |
809 | 239 "*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
|
240 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
|
241 :type 'string |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
242 :group 'two-column) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
243 (put '2C-separator 'permanent-local t) |
809 | 244 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
245 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
246 |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
247 (defcustom 2C-window-width 40 |
809 | 248 "*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
|
249 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
|
250 :type 'integer |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
251 :group 'two-column) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
252 (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
|
253 (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
|
254 |
809 | 255 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
256 |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
257 (defcustom 2C-beyond-fill-column 4 |
809 | 258 "*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
|
259 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
|
260 minus this value." |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
261 :type 'integer |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
262 :group 'two-column) |
809 | 263 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
264 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
265 |
17430
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
266 (defcustom 2C-autoscroll t |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
267 "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
|
268 :type 'boolean |
de68258fef5f
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16421
diff
changeset
|
269 :group 'two-column) |
12506
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 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
273 (defvar 2C-autoscroll-start nil) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
274 (make-variable-buffer-local '2C-autoscroll-start) |
809 | 275 |
276 ;;;;; base functions ;;;;; | |
277 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
278 ;; The access method for the other buffer. This tries to remedy against |
809 | 279 ;; lost local variables and lost buffers. |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
280 (defun 2C-other (&optional req) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
281 (or (if 2C-mode |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
282 (or (prog1 |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
283 (marker-buffer 2C-mode) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
284 (setq mode-line-format 2C-mode-line-format)) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
285 ;; The associated buffer somehow got killed. |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
286 (progn |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
287 ;; 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
|
288 ;; reestablishes the association. |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
289 (kill-local-variable '2C-mode) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
290 (kill-local-variable 'mode-line-format) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
291 nil))) |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33786
diff
changeset
|
292 (if req (error "You must first set two-column minor mode")))) |
809 | 293 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
294 |
809 | 295 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
296 ;; 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
|
297 ;; 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
|
298 (defun 2C-mode (other) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
299 "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
|
300 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
|
301 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
|
302 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
|
303 if that value is non-nil. |
809 | 304 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
305 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
|
306 If you want to disable parallel scrolling temporarily, use \\[2C-toggle-autoscroll] . |
809 | 307 |
308 If you include long lines, i.e which will span both columns (eg. | |
309 source code), they should be in what will be the first column, with | |
310 the associated buffer having empty lines next to them. | |
311 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
312 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
|
313 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
|
314 |
809 | 315 You have the following commands at your disposal: |
316 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
317 \\[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
|
318 \\[2C-associate-buffer] Reassociate buffer after changing major mode |
809 | 319 \\[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
|
320 \\[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
|
321 \\[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
|
322 \\[2C-merge] Merge both buffers |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
323 \\[2C-dissociate] Dissociate the two buffers |
809 | 324 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
325 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
|
326 `2C-minor-mode-map' and by binding `2C-command' to some prefix. |
809 | 327 |
328 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
|
329 `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
|
330 `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
|
331 (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
|
332 (setq fill-column (- 2C-window-width |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
333 2C-beyond-fill-column) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
334 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
|
335 2C-mode other) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
336 (run-hooks '2C-mode-hook)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
337 |
809 | 338 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
339 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
340 ;;;###autoload |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
341 (defun 2C-two-columns (&optional buffer) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
342 "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
|
343 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
|
344 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
|
345 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
|
346 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
|
347 first and the associated buffer to its right." |
809 | 348 (interactive "P") |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
349 ;; 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
|
350 (if (< (window-width) (frame-width)) |
809 | 351 (enlarge-window 99999 t)) |
352 (split-window-horizontally | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
353 (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
|
354 (- (frame-width) window-min-width)))) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
355 (if (2C-other) |
809 | 356 (progn |
357 (other-window 1) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
358 (switch-to-buffer (2C-other)) |
809 | 359 (other-window -1) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
360 (if 2C-autoscroll |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
361 (2C-toggle-autoscroll t))) |
809 | 362 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
363 (2C-mode (prog1 (point-marker) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
364 (other-window 1) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
365 (switch-to-buffer |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
366 (or buffer |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
367 (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
|
368 (or buffer |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
369 (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
|
370 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
371 (2C-mode (prog1 (point-marker) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
372 (other-window -1))))) |
809 | 373 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
374 |
809 | 375 |
1904
cca15d76f3e5
* two-column.el: Add autoloads for the functions defined in
Jim Blandy <jimb@redhat.com>
parents:
1245
diff
changeset
|
376 ;;;###autoload |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
377 (defun 2C-associate-buffer () |
809 | 378 "Associate another buffer with this one in two-column minor mode. |
379 Can also be used to associate a just previously visited file, by | |
380 accepting the proposed default buffer. | |
381 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
382 \(See \\[describe-mode] .)" |
809 | 383 (interactive) |
384 (let ((b1 (current-buffer)) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
385 (b2 (or (2C-other) |
809 | 386 (read-buffer "Associate buffer: " (other-buffer))))) |
387 (save-excursion | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
388 (setq 2C-mode nil) |
809 | 389 (set-buffer b2) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
390 (and (2C-other) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
391 (not (eq b1 (2C-other))) |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33786
diff
changeset
|
392 (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
|
393 (buffer-name (2C-other)))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
394 (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
|
395 2C-window-width))) |
809 | 396 ; 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
|
397 (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
|
398 (2C-two-columns b2))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
399 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
400 |
809 | 401 |
1904
cca15d76f3e5
* two-column.el: Add autoloads for the functions defined in
Jim Blandy <jimb@redhat.com>
parents:
1245
diff
changeset
|
402 ;;;###autoload |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
403 (defun 2C-split (arg) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
404 "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
|
405 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
|
406 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
|
407 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
|
408 value for `2C-separator'. This way lines that continue across both |
809 | 409 columns remain untouched in the first buffer. |
410 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
411 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
|
412 write the first line of each column and then split that line. E.g.: |
809 | 413 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
414 First column's text sSs Second column's text |
809 | 415 \\___/\\ |
416 / \\ | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
417 5 character Separator You type M-5 \\[2C-split] with the point here. |
809 | 418 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
419 \(See \\[describe-mode] .)" |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
420 (interactive "*p") |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
421 (and (2C-other) |
809 | 422 (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
|
423 (buffer-name (2C-other)) |
809 | 424 "'? ")) |
425 (save-excursion | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
426 (set-buffer (2C-other)) |
809 | 427 (erase-buffer)) |
428 (signal 'quit nil))) | |
429 (let ((point (point)) | |
430 ; make next-line always come back to same column | |
431 (goal-column (current-column)) | |
432 ; a counter for empty lines in other buffer | |
433 (n (1- (count-lines (point-min) (point)))) | |
434 chars other) | |
435 (save-excursion | |
436 (backward-char arg) | |
437 (setq chars (buffer-substring (point) point)) | |
438 (skip-chars-forward " \t" point) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
439 (make-local-variable '2C-separator) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
440 (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
|
441 2C-window-width (current-column))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
442 (2C-two-columns) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
443 (setq other (2C-other)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
444 ; now we're ready to actually split |
809 | 445 (save-excursion |
446 (while (not (eobp)) | |
447 (if (not (and (= (current-column) goal-column) | |
448 (string= chars | |
449 (buffer-substring (point) | |
450 (save-excursion | |
451 (backward-char arg) | |
452 (point)))))) | |
453 (setq n (1+ n)) | |
454 (setq point (point)) | |
455 (backward-char arg) | |
456 (skip-chars-backward " \t") | |
457 (delete-region point (point)) | |
458 (setq point (point)) | |
459 (insert-char ?\n n) | |
460 (append-to-buffer other point (progn (end-of-line) | |
461 (if (eobp) | |
462 (point) | |
463 (1+ (point))))) | |
464 (delete-region point (point)) | |
465 (setq n 0)) | |
466 (next-line 1))))) | |
467 | |
12506
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 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
471 (defun 2C-dissociate () |
809 | 472 "Turn off two-column minor mode in current and associated buffer. |
473 If the associated buffer is unmodified and empty, it is killed." | |
474 (interactive) | |
475 (let ((buffer (current-buffer))) | |
476 (save-excursion | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
477 (and (2C-other) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
478 (set-buffer (2C-other)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
479 (or (not (2C-other)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
480 (eq buffer (2C-other))) |
809 | 481 (if (and (not (buffer-modified-p)) |
482 (eobp) (bobp)) | |
483 (kill-buffer nil) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
484 (kill-local-variable '2C-mode) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
485 (kill-local-variable '2C-window-width) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
486 (kill-local-variable '2C-separator) |
809 | 487 (kill-local-variable 'mode-line-format) |
488 (kill-local-variable 'fill-column)))) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
489 (kill-local-variable '2C-mode) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
490 (kill-local-variable '2C-window-width) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
491 (kill-local-variable '2C-separator) |
809 | 492 (kill-local-variable 'mode-line-format) |
493 (kill-local-variable 'fill-column))) | |
494 | |
495 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
496 |
809 | 497 ;; this doesn't use yank-rectangle, so that the first column can |
498 ;; contain long lines | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
499 (defun 2C-merge () |
809 | 500 "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
|
501 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
|
502 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
|
503 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
|
504 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
|
505 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
|
506 this one, then this one becomes the left column. |
809 | 507 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
508 If you want `2C-separator' on empty lines in the second column, |
809 | 509 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
|
510 off trailing spaces with \\[delete-trailing-whitespace]." |
809 | 511 (interactive) |
512 (and (> (car (window-edges)) 0) ; not touching left edge of screen | |
513 (eq (window-buffer (previous-window)) | |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
514 (2C-other t)) |
809 | 515 (other-window -1)) |
516 (save-excursion | |
517 (let ((b1 (current-buffer)) | |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
518 (b2 (2C-other t)) |
809 | 519 string) |
520 (goto-char (point-min)) | |
521 (set-buffer b2) | |
522 (goto-char (point-min)) | |
523 (while (not (eobp)) | |
524 (setq string (buffer-substring (point) | |
525 (progn (end-of-line) (point)))) | |
526 (or (eobp) | |
527 (forward-char)) ; next line | |
528 (set-buffer b1) | |
529 (if (string= string "") | |
530 () | |
531 (end-of-line) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
532 (indent-to-column 2C-window-width) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
533 (insert 2C-separator string)) |
809 | 534 (next-line 1) ; add one if necessary |
535 (set-buffer b2)))) | |
1245
f8a5da3d18e8
Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents:
923
diff
changeset
|
536 (if (< (window-width) (frame-width)) |
809 | 537 (enlarge-window 99999 t))) |
538 | |
539 ;;;;; utility functions ;;;;; | |
540 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
541 (defun 2C-associated-buffer () |
809 | 542 "Switch to associated buffer." |
543 (interactive) | |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
544 (let ((line (+ (count-lines (point-min) (point)) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
545 (if (bolp) 1 0))) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
546 (col (if (eolp) (if (bolp) 0) (current-column)))) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
547 (if (get-buffer-window (2C-other t)) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
548 (select-window (get-buffer-window (2C-other))) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
549 (switch-to-buffer (2C-other))) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
550 (newline (goto-line line)) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
551 (if col |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
552 (move-to-column col) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
553 (end-of-line 1)))) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
554 |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
555 (defun 2C-newline (arg) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
556 "Insert ARG newlines in both buffers." |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
557 (interactive "P") |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
558 (save-window-excursion |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
559 (2C-associated-buffer) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
560 (newline arg)) |
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
561 (newline arg)) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
562 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
563 (defun 2C-toggle-autoscroll (arg) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
564 "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
|
565 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
|
566 (interactive "P") |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
567 ;(sit-for 0) |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
568 (setq 2C-autoscroll-start (window-start)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
569 (if (setq 2C-autoscroll (if arg |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
570 (>= (prefix-numeric-value arg) 0) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
571 (not 2C-autoscroll))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
572 (select-window |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
573 (prog1 (selected-window) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
574 (message "Autoscrolling is on.") |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
575 (setq arg (count-lines (point-min) (window-start))) |
12739
ae2e8daffa31
(2C-toggle-autoscroll, 2C-autoscroll):
Karl Heuer <kwzh@gnu.org>
parents:
12506
diff
changeset
|
576 (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
|
577 (progn |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
578 (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
|
579 (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
|
580 ;; 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
|
581 (save-excursion |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
582 (insert-char ?\n |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
583 (- arg (count-lines (window-start) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
584 (goto-char (point-max))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
585 -1))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
586 (scroll-up arg))))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
587 (message "Autoscrolling is off."))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
588 |
809 | 589 |
590 | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
591 (defun 2C-autoscroll () |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
592 (if 2C-autoscroll |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
593 ;; 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
|
594 (select-window |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
595 (prog1 (selected-window) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
596 (and (consp last-command-char) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
597 (not (eq (selected-window) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
598 (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 (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
|
600 ;; 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
|
601 ;; 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
|
602 (condition-case () |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
603 (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
|
604 (/= (window-start) 2C-autoscroll-start) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
605 (2C-other) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
606 (get-buffer-window (2C-other)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
607 (let ((lines (count-lines (window-start) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
608 2C-autoscroll-start))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
609 (if (< (window-start) 2C-autoscroll-start) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
610 (setq lines (- lines))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
611 (setq 2C-autoscroll-start (window-start)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
612 (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
|
613 ;; 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
|
614 (save-excursion |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
615 (insert-char |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
616 ?\n (- lines (count-lines (window-start) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
617 (goto-char (point-max))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
618 -1))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
619 (scroll-up lines) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
620 (setq 2C-autoscroll-start (window-start)))) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
621 (error)))))) |
809 | 622 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
623 |
809 | 624 |
13388
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
625 (defun 2C-enlarge-window-horizontally (arg) |
809 | 626 "Make current window ARG columns wider." |
627 (interactive "p") | |
628 (enlarge-window arg t) | |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
629 (and (2C-other) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
630 (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
|
631 (set-buffer (2C-other)) |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
632 (setq 2C-window-width (- 2C-window-width arg)))) |
809 | 633 |
13388
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
634 (defun 2C-shrink-window-horizontally (arg) |
809 | 635 "Make current window ARG columns narrower." |
636 (interactive "p") | |
13388
af2bb7490ca9
(minor-mode-map-alist): Use substitute-key-definition
Karl Heuer <kwzh@gnu.org>
parents:
12934
diff
changeset
|
637 (2C-enlarge-window-horizontally (- arg))) |
809 | 638 |
12506
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
639 |
5dc02bbeb4be
Symbols renamed to be like mode-line indicator.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
640 |
1245
f8a5da3d18e8
Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents:
923
diff
changeset
|
641 (provide 'two-column) |
f8a5da3d18e8
Use frame-width instead of screen-width.
Richard M. Stallman <rms@gnu.org>
parents:
923
diff
changeset
|
642 |
52401 | 643 ;;; arch-tag: 2021b5ab-d3a4-4a8c-a21c-1936b0f9e6b1 |
809 | 644 ;;; two-column.el ends here |