Mercurial > emacs
annotate lisp/textmodes/refill.el @ 109415:5922ae6fb6dc
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 22 Jun 2010 22:50:34 +0000 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
rev | line source |
---|---|
32750 | 1 ;;; refill.el --- `auto-fill' by refilling paragraphs on changes |
2 | |
74509 | 3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, |
106815 | 4 ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
32750 | 5 |
6 ;; Author: Dave Love <fx@gnu.org> | |
52290 | 7 ;; Maintainer: Miles Bader <miles@gnu.org> |
32750 | 8 ;; Keywords: wp |
9 | |
38401 | 10 ;; This file is part of GNU Emacs. |
11 | |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79719
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
32750 | 13 ;; it under the terms of the GNU General Public License as published by |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79719
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79719
diff
changeset
|
15 ;; (at your option) any later version. |
38401 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
32750 | 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
38401 | 21 |
32750 | 22 ;; You should have received a copy of the GNU General Public License |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79719
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
32750 | 24 |
25 ;;; Commentary: | |
26 | |
27 ;; Provides a mode where paragraphs are refilled after changes in them | |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
28 ;; (using `after-change-functions'). This gives something akin to typical |
32750 | 29 ;; word processor-style filling. We restrict refilling due to |
30 ;; self-insertion to the characters which trigger auto-fill. | |
31 | |
32 ;; It partly satisfies a todo item in enriched.el for some value of | |
33 ;; `without slowing down editing too much'. It doesn't attempt to do | |
34 ;; anything (using `window-size-change-functions'?) about resizing | |
35 ;; windows -- who cares? | |
36 | |
37 ;; This implementation is probably fragile and missing some special | |
38 ;; cases -- not extensively tested. Yanking paragraph breaks, for | |
39 ;; instance, won't DTRT by refilling all the relevant paragraphs. | |
40 | |
41 ;; You could do it a bit more efficiently (and robustly?) with just an | |
42 ;; auto-fill function, but that doesn't cope with changes other than | |
43 ;; through self-insertion. (Using auto-fill and after-change | |
44 ;; functions together didn't seem winning.) This could probably | |
45 ;; benefit from a less-general and faster `fill-paragraph-function', | |
46 ;; ideally as a primitive. | |
47 | |
48 ;; The work is done in a local post-command hook but only if | |
49 ;; `refill-doit' has been set by the after-change function. Using | |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
50 ;; `post-command-hook' ensures simply that refilling only happens |
32750 | 51 ;; once per command. |
52 | |
53 ;; [Per Abrahamsen's maniac.el does a similar thing, but operates from | |
54 ;; post-command-hook. I don't understand the statement in it that | |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
55 ;; after-change-functions don't work for this purpose; perhaps there was |
32750 | 56 ;; some Emacs bug at the time. ISTR maniac has problems with |
57 ;; whitespace at the end of paragraphs.] | |
58 | |
39894
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
59 ;;; Todo/Bugs: |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
60 |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
61 ;; - When deleting the first word on a line, the space after that word tends |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
62 ;; to become part of the fill-prefix, causing either wrong filling of the |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
63 ;; remaining text, or causing the cursor to move unexpectedly. Ex: |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
64 ;; Start with |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
65 ;; I>< blabla |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
66 ;; |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
67 ;; and hit backspace. We end up with |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
68 ;; |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
69 ;; ><blabla |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
70 ;; instead of |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
71 ;; >< blabla |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
72 ;; |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
73 ;; Other example. Start with |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
74 ;; |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
75 ;; Foo bar blablabla asdgf |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
76 ;; word>< asdfas dfasdfasd |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
77 ;; asd asdfa sdfasd sdf |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
78 ;; |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
79 ;; and hit M-backspace. We end up with |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
80 ;; |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
81 ;; Foo bar blablabla asdgf |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
82 ;; ><asdfas dfasdfasd asd |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
83 ;; asdfa sdfasd sdf |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
84 |
32750 | 85 ;;; Code: |
86 | |
59709
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
87 (eval-when-compile (require 'cl)) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
88 |
48415
3f0b3e6d23fb
(defgroup refill): New group.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
42263
diff
changeset
|
89 (defgroup refill nil |
3f0b3e6d23fb
(defgroup refill): New group.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
42263
diff
changeset
|
90 "Refilling paragraphs on changes." |
3f0b3e6d23fb
(defgroup refill): New group.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
42263
diff
changeset
|
91 :group 'fill) |
3f0b3e6d23fb
(defgroup refill): New group.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
42263
diff
changeset
|
92 |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
93 (defvar refill-ignorable-overlay nil |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
94 "Portion of the most recently filled paragraph not needing filling. |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
95 This is used to optimize refilling.") |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
96 (make-variable-buffer-local 'refill-ignorable-overlay) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
97 |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
98 (defun refill-adjust-ignorable-overlay (overlay afterp beg end &optional len) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
99 "Adjust OVERLAY to not include the about-to-be-modified region." |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
100 (when (not afterp) |
32750 | 101 (save-excursion |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
102 (goto-char beg) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
103 (forward-line -1) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
104 (if (<= (point) (overlay-start overlay)) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
105 ;; Just get OVERLAY out of the way |
51335
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
106 (move-overlay overlay (point-min) (point-min)) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48415
diff
changeset
|
107 ;; Make overlay contain only the region |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
108 (move-overlay overlay (overlay-start overlay) (point)))))) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
109 |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
110 (defun refill-fill-paragraph-at (pos &optional arg) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
111 "Like `fill-paragraph' at POS, but don't delete whitespace at paragraph end." |
51335
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
112 (save-excursion |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
113 (goto-char pos) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
114 ;; FIXME: forward-paragraph seems to disregard `use-hard-newlines', |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
115 ;; leading to excessive refilling and wrong choice of fill-prefix. |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
116 ;; might be a bug in my paragraphs.el. |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
117 (forward-paragraph) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
118 (skip-syntax-backward "-") |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
119 (let ((end (point)) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
120 (beg (progn (backward-paragraph) (point))) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
121 (obeg (overlay-start refill-ignorable-overlay)) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
122 (oend (overlay-end refill-ignorable-overlay))) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
123 (unless (> beg pos) ;Don't fill if point is outside the paragraph. |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
124 (goto-char pos) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
125 (if (and (>= beg obeg) (< beg oend)) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
126 ;; Limit filling to the modified tail of the paragraph. |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
127 (let ( ;; When adaptive-fill-mode is enabled, the filling |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
128 ;; functions will attempt to set the fill prefix from |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
129 ;; the fake paragraph bounds we pass in, so set it |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
130 ;; ourselves first, using the real paragraph bounds. |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
131 (fill-prefix |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
132 (if (and adaptive-fill-mode |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
133 (or (null fill-prefix) (string= fill-prefix ""))) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
134 (fill-context-prefix beg end) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
135 fill-prefix)) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
136 ;; Turn off adaptive-fill-mode temporarily |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
137 (adaptive-fill-mode nil)) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
138 (save-restriction |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
139 (if use-hard-newlines |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
140 (fill-region oend end arg) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
141 (fill-region-as-paragraph oend end arg))) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
142 (move-overlay refill-ignorable-overlay obeg (point))) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
143 ;; Fill the whole paragraph |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
144 (save-restriction |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
145 (if use-hard-newlines |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
146 (fill-region beg end arg) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
147 (fill-region-as-paragraph beg end arg))) |
816e3b31173a
(refill-adjust-ignorable-overlay): Don't hardcode pint-min == 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51292
diff
changeset
|
148 (move-overlay refill-ignorable-overlay beg (point))))))) |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
149 |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
150 (defun refill-fill-paragraph (arg) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
151 "Like `fill-paragraph' but don't delete whitespace at paragraph end." |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
152 (refill-fill-paragraph-at (point) arg)) |
32750 | 153 |
154 (defvar refill-doit nil | |
51292
c41cc5ded813
(refill-fill-paragraph-at): Avoid refilling the following paragraph.
Richard M. Stallman <rms@gnu.org>
parents:
50440
diff
changeset
|
155 "Non-nil tells `refill-post-command-function' to do its processing. |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
156 Set by `refill-after-change-function' in `after-change-functions' and |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
157 unset by `refill-post-command-function' in `post-command-hook', and |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
158 sometimes `refill-pre-command-function' in `pre-command-hook'. This |
32750 | 159 ensures refilling is only done once per command that causes a change, |
160 regardless of the number of after-change calls from commands doing | |
161 complex processing.") | |
162 (make-variable-buffer-local 'refill-doit) | |
163 | |
164 (defun refill-after-change-function (beg end len) | |
165 "Function for `after-change-functions' which just sets `refill-doit'." | |
166 (unless undo-in-progress | |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
167 (setq refill-doit end))) |
32750 | 168 |
169 (defun refill-post-command-function () | |
170 "Post-command function to do refilling (conditionally)." | |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
171 (when refill-doit ; there was a change |
32750 | 172 ;; There's probably scope for more special cases here... |
59709
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
173 (case this-command |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
174 (self-insert-command |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
175 ;; Treat self-insertion commands specially, since they don't |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
176 ;; always reset `refill-doit' -- for self-insertion commands that |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
177 ;; *don't* cause a refill, we want to leave it turned on so that |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
178 ;; any subsequent non-modification command will cause a refill. |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
179 (when (aref auto-fill-chars (char-before)) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
180 ;; Respond to the same characters as auto-fill (other than |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
181 ;; newline, covered below). |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
182 (refill-fill-paragraph-at refill-doit) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
183 (setq refill-doit nil))) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
184 ((quoted-insert fill-paragraph fill-region) nil) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
185 ((newline newline-and-indent open-line indent-new-comment-line |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
186 reindent-then-newline-and-indent) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
187 ;; Don't zap what was just inserted. |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
188 (save-excursion |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
189 (beginning-of-line) ; for newline-and-indent |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
190 (skip-chars-backward "\n") |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
191 (save-restriction |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
192 (narrow-to-region (point-min) (point)) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
193 (refill-fill-paragraph-at refill-doit))) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
194 (widen) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
195 (save-excursion |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
196 (skip-chars-forward "\n") |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
197 (save-restriction |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
198 (narrow-to-region (line-beginning-position) (point-max)) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
199 (refill-fill-paragraph-at refill-doit)))) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
200 (t |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
201 (refill-fill-paragraph-at refill-doit))) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
202 (setq refill-doit nil))) |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
203 |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
204 (defun refill-pre-command-function () |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
205 "Pre-command function to do refilling (conditionally)." |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
206 (when (and refill-doit (not (eq this-command 'self-insert-command))) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
207 ;; A previous setting of `refill-doit' didn't result in a refill, |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
208 ;; because it was a self-insert-command. Since the next command is |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
209 ;; something else, do the refill now. |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
210 (refill-fill-paragraph-at refill-doit) |
32750 | 211 (setq refill-doit nil))) |
212 | |
59709
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
213 (defvar refill-saved-state nil) |
32960
0756037b6de5
(refill-late-fill-paragraph-function): New
Dave Love <fx@gnu.org>
parents:
32767
diff
changeset
|
214 |
32750 | 215 ;;;###autoload |
216 (define-minor-mode refill-mode | |
217 "Toggle Refill minor mode. | |
78482
80e300a489d6
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78225
diff
changeset
|
218 With prefix arg, turn Refill mode on if arg is positive, otherwise turn it off. |
32750 | 219 |
220 When Refill mode is on, the current paragraph will be formatted when | |
221 changes are made within it. Self-inserting characters only cause | |
222 refilling if they would cause auto-filling." | |
61288
6363fa77031a
(refill-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
59709
diff
changeset
|
223 :group 'refill |
6363fa77031a
(refill-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
59709
diff
changeset
|
224 :lighter " Refill" |
6363fa77031a
(refill-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
59709
diff
changeset
|
225 :keymap '(("\177" . backward-delete-char-untabify)) |
42263
ea39d5799d38
(refill-mode): Don't barf when redundantly turning refill-mode off.
Miles Bader <miles@gnu.org>
parents:
39894
diff
changeset
|
226 ;; Remove old state if necessary |
ea39d5799d38
(refill-mode): Don't barf when redundantly turning refill-mode off.
Miles Bader <miles@gnu.org>
parents:
39894
diff
changeset
|
227 (when refill-ignorable-overlay |
ea39d5799d38
(refill-mode): Don't barf when redundantly turning refill-mode off.
Miles Bader <miles@gnu.org>
parents:
39894
diff
changeset
|
228 (delete-overlay refill-ignorable-overlay) |
ea39d5799d38
(refill-mode): Don't barf when redundantly turning refill-mode off.
Miles Bader <miles@gnu.org>
parents:
39894
diff
changeset
|
229 (kill-local-variable 'refill-ignorable-overlay)) |
59709
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
230 (when (local-variable-p 'refill-saved-state) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
231 (dolist (x refill-saved-state) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
232 (set (make-local-variable (car x)) (cdr x))) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
233 (kill-local-variable 'refill-saved-state)) |
32750 | 234 (if refill-mode |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
235 (progn |
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
236 (add-hook 'after-change-functions 'refill-after-change-function nil t) |
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
237 (add-hook 'post-command-hook 'refill-post-command-function nil t) |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
238 (add-hook 'pre-command-hook 'refill-pre-command-function nil t) |
59709
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
239 (set (make-local-variable 'refill-saved-state) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
240 (mapcar (lambda (s) (cons s (symbol-value s))) |
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
241 '(fill-paragraph-function auto-fill-function))) |
42263
ea39d5799d38
(refill-mode): Don't barf when redundantly turning refill-mode off.
Miles Bader <miles@gnu.org>
parents:
39894
diff
changeset
|
242 ;; This provides the test for recursive paragraph filling. |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
243 (set (make-local-variable 'fill-paragraph-function) |
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
244 'refill-fill-paragraph) |
39894
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
245 ;; When using justification, doing DEL on 2 spaces should remove |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
246 ;; both, otherwise, the subsequent refill will undo the DEL. |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
247 (set (make-local-variable 'backward-delete-char-untabify-method) |
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
248 'hungry) |
33660
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
249 (setq refill-ignorable-overlay (make-overlay 1 1 nil nil t)) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
250 (overlay-put refill-ignorable-overlay 'modification-hooks |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
251 '(refill-adjust-ignorable-overlay)) |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
252 (overlay-put refill-ignorable-overlay 'insert-behind-hooks |
b22657305a2c
(refill-ignorable-overlay): New variable.
Miles Bader <miles@gnu.org>
parents:
32960
diff
changeset
|
253 '(refill-adjust-ignorable-overlay)) |
32761
f7e7454c16a0
Fix var names in doc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32750
diff
changeset
|
254 (auto-fill-mode 0)) |
32750 | 255 (remove-hook 'after-change-functions 'refill-after-change-function t) |
256 (remove-hook 'post-command-hook 'refill-post-command-function t) | |
39894
b27f7112ce6f
(refill-mode): Bind DEL to backward-delete-char-untabify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38401
diff
changeset
|
257 (kill-local-variable 'backward-delete-char-untabify-method))) |
32750 | 258 |
259 (provide 'refill) | |
260 | |
59709
73def390d890
(refill-post-command-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
261 ;; arch-tag: 2c4ce9e8-1daa-4a3b-b6f8-fd6ac5bf6138 |
32750 | 262 ;;; refill.el ends here |