annotate lisp/textmodes/fill.el @ 9217:1ed75812c134

(fill-region, fill-region-as-paragraph): Fix previous change.
author Richard M. Stallman <rms@gnu.org>
date Sun, 02 Oct 1994 02:23:21 +0000
parents 83d8b85cd8c2
children f5f7d07eece8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
1 ;;; fill.el --- fill commands for Emacs
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
2
7300
cc7cd83ccf3f Update copyright.
Karl Heuer <kwzh@gnu.org>
parents: 5770
diff changeset
3 ;; Copyright (C) 1985, 1986, 1992, 1994 Free Software Foundation, Inc.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 821
diff changeset
4
811
e694e0879463 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
5 ;; Keywords: wp
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 732
diff changeset
6
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
8
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 732
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
12 ;; any later version.
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
13
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
17 ;; GNU General Public License for more details.
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
18
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
21 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
22
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2109
diff changeset
23 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2109
diff changeset
24
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2109
diff changeset
25 ;; All the commands for filling text. These are documented in the Emacs
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2109
diff changeset
26 ;; manual.
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2109
diff changeset
27
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 732
diff changeset
28 ;;; Code:
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
29
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
30 (defconst fill-individual-varying-indent nil
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
31 "*Controls criterion for a new paragraph in `fill-individual-paragraphs'.
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
32 Non-nil means changing indent doesn't end a paragraph.
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
33 That mode can handle paragraphs with extra indentation on the first line,
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
34 but it requires separator lines between paragraphs.
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
35 A value of nil means that any change in indentation starts a new paragraph.")
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
36
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
37 (defconst sentence-end-double-space t
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
38 "*Non-nil means a single space does not end a sentence.")
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
39
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
40 (defun set-fill-prefix ()
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
41 "Set the fill prefix to the current line up to point.
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
42 Filling expects lines to start with the fill prefix and
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
43 reinserts the fill prefix in each resulting line."
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
44 (interactive)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
45 (setq fill-prefix (buffer-substring
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
46 (save-excursion (beginning-of-line) (point))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
47 (point)))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
48 (if (equal fill-prefix "")
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
49 (setq fill-prefix nil))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
50 (if fill-prefix
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
51 (message "fill-prefix: \"%s\"" fill-prefix)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
52 (message "fill-prefix cancelled")))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
53
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
54 (defconst adaptive-fill-mode t
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
55 "*Non-nil means determine a paragraph's fill prefix from its text.")
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
56
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
57 (defconst adaptive-fill-regexp "[ \t]*\\([>*] +\\)?"
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
58 "*Regexp to match text at start of line that constitutes indentation.
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
59 If Adaptive Fill mode is enabled, whatever text matches this pattern
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
60 on the second line of a paragraph is used as the standard indentation
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
61 for the paragraph.")
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
62
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
63 (defun fill-region-as-paragraph (from to &optional justify-flag)
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
64 "Fill region as one paragraph: break lines to fit `fill-column'.
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
65 Prefix arg means justify too.
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
66 If `sentence-end-double-space' is non-nil, then period followed by one
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
67 space does not end a sentence, so don't break a line there.
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
68 From program, pass args FROM, TO and JUSTIFY-FLAG."
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
69 (interactive "r\nP")
1332
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
70 ;; Arrange for undoing the fill to restore point.
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
71 (if (and buffer-undo-list (not (eq buffer-undo-list t)))
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
72 (setq buffer-undo-list (cons (point) buffer-undo-list)))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
73 ;; Don't let Adaptive Fill mode alter the fill prefix permanently.
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
74 (let ((fill-prefix fill-prefix))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
75 ;; Figure out how this paragraph is indented, if desired.
670
bff41708644e *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 662
diff changeset
76 (if (and adaptive-fill-mode
bff41708644e *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 662
diff changeset
77 (or (null fill-prefix) (string= fill-prefix "")))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
78 (save-excursion
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
79 (goto-char (min from to))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
80 (if (eolp) (forward-line 1))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
81 (forward-line 1)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
82 (if (< (point) (max from to))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
83 (let ((start (point)))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
84 (re-search-forward adaptive-fill-regexp)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
85 (setq fill-prefix (buffer-substring start (point))))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
86 (goto-char (min from to))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
87 (if (eolp) (forward-line 1))
7721
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
88 ;; If paragraph has only one line, don't assume in general
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
89 ;; that additional lines would have the same starting
729
5d684b81ac6b *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 719
diff changeset
90 ;; decoration. Assume no indentation.
7721
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
91 ;; But if left-margin is nonzero, we can assume ordinary
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
92 ;; lines do have indentation.
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
93 (if (> left-margin 0)
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
94 (progn
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
95 (re-search-forward adaptive-fill-regexp)
b04897534717 (fill-region-as-paragraph): if left-margin is nonzero,
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
96 (setq fill-prefix (make-string (current-column) ?\ ))))
729
5d684b81ac6b *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 719
diff changeset
97 )))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
98
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
99 (save-restriction
9207
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
100 (goto-char (max from to))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
101 ;; If specified region ends before a newline,
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
102 ;; include that newline.
9217
1ed75812c134 (fill-region, fill-region-as-paragraph): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9207
diff changeset
103 (if (and (eolp) (not (eobp)) (not (bolp)))
9207
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
104 (forward-char 1))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
105 (narrow-to-region (min from to) (point))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
106 (goto-char (point-min))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
107 (skip-chars-forward "\n")
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
108 (narrow-to-region (point) (point-max))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
109 (setq from (point))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
110 (goto-char (point-max))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
111 (let ((fpre (and fill-prefix (not (equal fill-prefix ""))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
112 (regexp-quote fill-prefix))))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
113 ;; Delete the fill prefix from every line except the first.
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
114 ;; The first line may not even have a fill prefix.
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
115 (and fpre
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
116 (progn
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
117 (if (>= (length fill-prefix) fill-column)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
118 (error "fill-prefix too long for specified width"))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
119 (goto-char (point-min))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
120 (forward-line 1)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
121 (while (not (eobp))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
122 (if (looking-at fpre)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
123 (delete-region (point) (match-end 0)))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
124 (forward-line 1))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
125 (goto-char (point-min))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
126 (and (looking-at fpre) (forward-char (length fill-prefix)))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
127 (setq from (point)))))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
128 ;; from is now before the text to fill,
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
129 ;; but after any fill prefix on the first line.
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
130
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
131 ;; Make sure sentences ending at end of line get an extra space.
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
132 ;; loses on split abbrevs ("Mr.\nSmith")
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
133 (goto-char from)
670
bff41708644e *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 662
diff changeset
134 (while (re-search-forward "[.?!][])}\"']*$" nil t)
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
135 (insert ? ))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
136
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
137 ;; Then change all newlines to spaces.
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
138 (subst-char-in-region from (point-max) ?\n ?\ )
2376
f7a3795bd1c5 (fill-paragraph, justify-current-line) Now uses the skip-syntax-
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2307
diff changeset
139
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
140 ;; Flush excess spaces, except in the paragraph indentation.
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
141 (goto-char from)
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
142 (skip-chars-forward " \t")
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
143 ;; Nuke tabs while we're at it; they get screwed up in a fill.
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
144 ;; This is quick, but loses when a tab follows the end of a sentence.
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
145 ;; Actually, it is difficult to tell that from "Mr.\tSmith".
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
146 ;; Blame the typist.
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
147 (subst-char-in-region (point) (point-max) ?\t ?\ )
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
148 (while (re-search-forward " *" nil t)
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
149 (delete-region
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
150 (+ (match-beginning 0)
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
151 (if (and sentence-end-double-space
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
152 (save-excursion
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
153 (skip-chars-backward " ]})\"'")
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
154 (memq (preceding-char) '(?. ?? ?!))))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
155 2 1))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
156 (match-end 0)))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
157 (goto-char (point-max))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
158 (delete-horizontal-space)
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
159 (insert " ")
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
160 (goto-char (point-min))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
161
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
162 ;; This is the actual filling loop.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
163 (let ((prefixcol 0) linebeg)
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
164 (while (not (eobp))
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
165 (setq linebeg (point))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
166 (move-to-column (1+ fill-column))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
167 (if (eobp)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
168 nil
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
169 ;; Move back to start of word.
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
170 (skip-chars-backward "^ \n" linebeg)
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
171 ;; Don't break after a period followed by just one space.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
172 ;; Move back to the previous place to break.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
173 ;; The reason is that if a period ends up at the end of a line,
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
174 ;; further fills will assume it ends a sentence.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
175 ;; If we now know it does not end a sentence,
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
176 ;; avoid putting it at the end of the line.
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
177 (if sentence-end-double-space
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
178 (while (and (> (point) (+ linebeg 2))
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
179 (eq (preceding-char) ?\ )
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
180 (not (eq (following-char) ?\ ))
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
181 (eq (char-after (- (point) 2)) ?\.))
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
182 (forward-char -2)
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
183 (skip-chars-backward "^ \n" linebeg)))
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
184 (if (if (zerop prefixcol)
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
185 (save-excursion
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
186 (skip-chars-backward " " linebeg)
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
187 (bolp))
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
188 (>= prefixcol (current-column)))
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
189 ;; Keep at least one word even if fill prefix exceeds margin.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
190 ;; This handles all but the first line of the paragraph.
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
191 ;; Meanwhile, don't stop at a period followed by one space.
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
192 (let ((first t))
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
193 (move-to-column prefixcol)
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
194 (while (and (not (eobp))
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
195 (or first
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
196 (and (not (bobp))
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
197 sentence-end-double-space
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
198 (save-excursion (forward-char -1)
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
199 (and (looking-at "\\. ")
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
200 (not (looking-at "\\. ")))))))
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
201 (skip-chars-forward " ")
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
202 (skip-chars-forward "^ \n")
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
203 (setq first nil)))
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
204 ;; Normally, move back over the single space between the words.
4352
d00889d02f75 (fill-region-as-paragraph): Move misplaced paren
Richard M. Stallman <rms@gnu.org>
parents: 2520
diff changeset
205 (forward-char -1))
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
206 (if (and fill-prefix (zerop prefixcol)
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
207 (< (- (point) (point-min)) (length fill-prefix))
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
208 (string= (buffer-substring (point-min) (point))
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
209 (substring fill-prefix 0 (- (point) (point-min)))))
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
210 ;; Keep at least one word even if fill prefix exceeds margin.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
211 ;; This handles the first line of the paragraph.
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
212 ;; Don't stop at a period followed by just one space.
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
213 (let ((first t))
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
214 (while (and (not (eobp))
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
215 (or first
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
216 (and (not (bobp))
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
217 sentence-end-double-space
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
218 (save-excursion (forward-char -1)
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
219 (and (looking-at "\\. ")
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
220 (not (looking-at "\\. ")))))))
4413
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
221 (skip-chars-forward " ")
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
222 (skip-chars-forward "^ \n")
5a00cec8e9b0 (fill-region-as-paragraph): When we take one word
Richard M. Stallman <rms@gnu.org>
parents: 4352
diff changeset
223 (setq first nil)))))
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
224 ;; Replace all whitespace here with one newline.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
225 ;; Insert before deleting, so we don't forget which side of
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
226 ;; the whitespace point or markers used to be on.
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
227 (skip-chars-backward " ")
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
228 (insert ?\n)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
229 (delete-horizontal-space)
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
230 ;; Insert the fill prefix at start of each line.
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
231 ;; Set prefixcol so whitespace in the prefix won't get lost.
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
232 (and (not (eobp)) fill-prefix (not (equal fill-prefix ""))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
233 (progn
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
234 (insert fill-prefix)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
235 (setq prefixcol (current-column))))
719
3007551721dc *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 670
diff changeset
236 ;; Justify the line just ended, if desired.
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
237 (and justify-flag (not (eobp))
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
238 (progn
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
239 (forward-line -1)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
240 (justify-current-line)
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
241 (forward-line 1))))))))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
242
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
243 (defun fill-paragraph (arg)
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
244 "Fill paragraph at or after point. Prefix arg means justify as well.
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
245 If `sentence-end-double-space' is non-nil, then period followed by one
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
246 space does not end a sentence, so don't break a line there."
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
247 (interactive "P")
1332
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
248 (let ((before (point)))
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
249 (save-excursion
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
250 (forward-paragraph)
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
251 (or (bolp) (newline 1))
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
252 (let ((end (point))
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
253 (beg (progn (backward-paragraph) (point))))
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
254 (goto-char before)
955ebdb98095 (fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents: 1067
diff changeset
255 (fill-region-as-paragraph beg end arg)))))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
256
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
257 (defun fill-region (from to &optional justify-flag)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
258 "Fill each of the paragraphs in the region.
5770
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
259 Prefix arg (non-nil third arg, if called from program) means justify as well.
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
260 If `sentence-end-double-space' is non-nil, then period followed by one
92dd602768d2 (sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5291
diff changeset
261 space does not end a sentence, so don't break a line there."
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
262 (interactive "r\nP")
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
263 (save-restriction
9207
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
264 (goto-char (max from to))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
265 ;; If specified region ends before a newline,
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
266 ;; include that newline.
9217
1ed75812c134 (fill-region, fill-region-as-paragraph): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9207
diff changeset
267 (if (and (eolp) (not (eobp)) (not (bolp)))
9207
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
268 (forward-char 1))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
269 (narrow-to-region (min from to) (point))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
270 (goto-char (point-min))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
271 (while (not (eobp))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
272 (let ((initial (point))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
273 (end (progn
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
274 (forward-paragraph 1) (point))))
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
275 (forward-paragraph -1)
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
276 (if (>= (point) initial)
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
277 (fill-region-as-paragraph (point) end justify-flag)
83d8b85cd8c2 (fill-region, fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents: 9026
diff changeset
278 (goto-char end))))))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
279
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
280 (defun justify-current-line ()
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
281 "Add spaces to line point is in, so it ends at `fill-column'."
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
282 (interactive)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
283 (save-excursion
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
284 (save-restriction
8363
bf559544bd48 (justify-current-line): Delete space at end of line.
Richard M. Stallman <rms@gnu.org>
parents: 7721
diff changeset
285 (let (ncols beg indent end)
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
286 (beginning-of-line)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
287 (forward-char (length fill-prefix))
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
288 (skip-chars-forward " \t")
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
289 (setq indent (current-column))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
290 (setq beg (point))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
291 (end-of-line)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
292 (narrow-to-region beg (point))
8363
bf559544bd48 (justify-current-line): Delete space at end of line.
Richard M. Stallman <rms@gnu.org>
parents: 7721
diff changeset
293 (setq end (point))
bf559544bd48 (justify-current-line): Delete space at end of line.
Richard M. Stallman <rms@gnu.org>
parents: 7721
diff changeset
294 (skip-chars-backward " \t")
bf559544bd48 (justify-current-line): Delete space at end of line.
Richard M. Stallman <rms@gnu.org>
parents: 7721
diff changeset
295 (delete-char (- end (point)))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
296 (goto-char beg)
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
297 (while (re-search-forward " *" nil t)
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
298 (delete-region
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
299 (+ (match-beginning 0)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
300 (if (save-excursion
2409
d03c7b8ac284 Cancel previous change; this version should be identical to version 1.17.
Richard M. Stallman <rms@gnu.org>
parents: 2376
diff changeset
301 (skip-chars-backward " ])\"'")
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
302 (memq (preceding-char) '(?. ?? ?!)))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
303 2 1))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
304 (match-end 0)))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
305 (goto-char beg)
1067
eb89a883529c entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
306 (while (re-search-forward "[.?!][])\"']*\n" nil t)
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
307 (forward-char -1)
9026
74fd93bc3568 (justify-current-line): Inherit props when inserting spaces.
Richard M. Stallman <rms@gnu.org>
parents: 8363
diff changeset
308 (insert-and-inherit ? ))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
309 (goto-char (point-max))
218
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
310 ;; Note that the buffer bounds start after the indentation,
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
311 ;; so the columns counted by INDENT don't appear in (current-column).
d492f16a8743 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 75
diff changeset
312 (setq ncols (- fill-column (current-column) indent))
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
313 (if (search-backward " " nil t)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
314 (while (> ncols 0)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
315 (let ((nmove (+ 3 (random 3))))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
316 (while (> nmove 0)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
317 (or (search-backward " " nil t)
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
318 (progn
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
319 (goto-char (point-max))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
320 (search-backward " ")))
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
321 (skip-chars-backward " ")
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
322 (setq nmove (1- nmove))))
9026
74fd93bc3568 (justify-current-line): Inherit props when inserting spaces.
Richard M. Stallman <rms@gnu.org>
parents: 8363
diff changeset
323 (insert-and-inherit " ")
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
324 (skip-chars-backward " ")
2109
73485780a8f9 * simple.el (yank, yank-pop): Always return nil; don't rely on
Jim Blandy <jimb@redhat.com>
parents: 1332
diff changeset
325 (setq ncols (1- ncols)))))))
73485780a8f9 * simple.el (yank, yank-pop): Always return nil; don't rely on
Jim Blandy <jimb@redhat.com>
parents: 1332
diff changeset
326 nil)
9026
74fd93bc3568 (justify-current-line): Inherit props when inserting spaces.
Richard M. Stallman <rms@gnu.org>
parents: 8363
diff changeset
327
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
328
2520
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
329 (defun fill-nonuniform-paragraphs (min max &optional justifyp mailp)
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
330 "Fill paragraphs within the region, allowing varying indentation within each.
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
331 This command divides the region into \"paragraphs\",
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
332 only at paragraph-separator lines, then fills each paragraph
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
333 using as the fill prefix the smallest indentation of any line
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
334 in the paragraph.
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
335
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
336 When calling from a program, pass range to fill as first two arguments.
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
337
2520
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
338 Optional third and fourth arguments JUSTIFY-FLAG and MAIL-FLAG:
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
339 JUSTIFY-FLAG to justify paragraphs (prefix arg),
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
340 MAIL-FLAG for a mail message, i. e. don't fill header lines."
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
341 (interactive "r\nP")
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
342 (let ((fill-individual-varying-indent t))
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
343 (fill-individual-paragraphs min max justifyp mailp)))
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
344
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
345 (defun fill-individual-paragraphs (min max &optional justifyp mailp)
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
346 "Fill paragraphs of uniform indentation within the region.
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
347 This command divides the region into \"paragraphs\",
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
348 treating every change in indentation level as a paragraph boundary,
ef643dbb7d40 (fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2412
diff changeset
349 then fills each paragraph using its indentation level as the fill prefix.
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
350
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
351 When calling from a program, pass range to fill as first two arguments.
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
352
75
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
353 Optional third and fourth arguments JUSTIFY-FLAG and MAIL-FLAG:
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
354 JUSTIFY-FLAG to justify paragraphs (prefix arg),
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
355 MAIL-FLAG for a mail message, i. e. don't fill header lines."
a13ef7914930 Initial revision
root <root>
parents:
diff changeset
356 (interactive "r\nP")
474
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
357 (save-restriction
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
358 (save-excursion
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
359 (goto-char min)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
360 (beginning-of-line)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
361 (if mailp
821
cee415e2dae8 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 811
diff changeset
362 (while (or (looking-at "[ \t]*[^ \t\n]*:") (looking-at "[ \t]*$"))
4992
8a3293abe1ba (fill-individual-paragraphs): Fix skipping headers of yanked message.
Richard M. Stallman <rms@gnu.org>
parents: 4413
diff changeset
363 (if (looking-at "[ \t]*[^ \t\n]*:")
8a3293abe1ba (fill-individual-paragraphs): Fix skipping headers of yanked message.
Richard M. Stallman <rms@gnu.org>
parents: 4413
diff changeset
364 (search-forward "\n\n" nil 'move)
8a3293abe1ba (fill-individual-paragraphs): Fix skipping headers of yanked message.
Richard M. Stallman <rms@gnu.org>
parents: 4413
diff changeset
365 (forward-line 1))))
474
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
366 (narrow-to-region (point) max)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
367 ;; Loop over paragraphs.
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
368 (while (progn (skip-chars-forward " \t\n") (not (eobp)))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
369 (beginning-of-line)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
370 (let ((start (point))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
371 fill-prefix fill-prefix-regexp)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
372 ;; Find end of paragraph, and compute the smallest fill-prefix
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
373 ;; that fits all the lines in this paragraph.
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
374 (while (progn
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
375 ;; Update the fill-prefix on the first line
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
376 ;; and whenever the prefix good so far is too long.
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
377 (if (not (and fill-prefix
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
378 (looking-at fill-prefix-regexp)))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
379 (setq fill-prefix
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
380 (buffer-substring (point)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
381 (save-excursion (skip-chars-forward " \t") (point)))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
382 fill-prefix-regexp
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
383 (regexp-quote fill-prefix)))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
384 (forward-line 1)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
385 ;; Now stop the loop if end of paragraph.
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
386 (and (not (eobp))
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
387 (if fill-individual-varying-indent
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
388 ;; If this line is a separator line, with or
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
389 ;; without prefix, end the paragraph.
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
390 (and
474
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
391 (not (looking-at paragraph-separate))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
392 (save-excursion
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
393 (not (and (looking-at fill-prefix-regexp)
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
394 (progn (forward-char (length fill-prefix))
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
395 (looking-at paragraph-separate))))))
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
396 ;; If this line has more or less indent
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
397 ;; than the fill prefix wants, end the paragraph.
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
398 (and (looking-at fill-prefix-regexp)
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
399 (save-excursion
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
400 (not (progn (forward-char (length fill-prefix))
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
401 (or (looking-at paragraph-separate)
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
402 (looking-at paragraph-start))))))))))
474
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
403 ;; Fill this paragraph, but don't add a newline at the end.
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
404 (let ((had-newline (bolp)))
c3bbd755b7da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 218
diff changeset
405 (fill-region-as-paragraph start (point) justifyp)
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 474
diff changeset
406 (or had-newline (delete-char -1))))))))
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 638
diff changeset
407
732
a8d94735277e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 729
diff changeset
408 ;;; fill.el ends here