Mercurial > emacs
annotate lisp/textmodes/fill.el @ 33132:73ec1ee4f829
*** empty log message ***
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 01 Nov 2000 23:31:59 +0000 |
parents | 8d54281f48c3 |
children | 2c0585b6e6d6 |
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 |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 1999 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 | 7 ;; This file is part of GNU Emacs. |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
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 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
75 | 23 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
24 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
25 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
26 ;; 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
|
27 ;; manual. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
28 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
29 ;;; Code: |
75 | 30 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
31 (defcustom fill-individual-varying-indent nil |
638 | 32 "*Controls criterion for a new paragraph in `fill-individual-paragraphs'. |
33 Non-nil means changing indent doesn't end a paragraph. | |
34 That mode can handle paragraphs with extra indentation on the first line, | |
35 but it requires separator lines between paragraphs. | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
36 A value of nil means that any change in indentation starts a new paragraph." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
37 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
38 :group 'fill) |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
39 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
40 (defcustom sentence-end-double-space t |
24473
e80a549e7dd8
(sentence-end-double-space): Doc fix.
Dave Love <fx@gnu.org>
parents:
23993
diff
changeset
|
41 "*Non-nil means a single space does not end a sentence. |
32230 | 42 This is relevant for filling. See also `sentence-end-without-period' |
43 and `colon-double-space'. | |
24473
e80a549e7dd8
(sentence-end-double-space): Doc fix.
Dave Love <fx@gnu.org>
parents:
23993
diff
changeset
|
44 |
32230 | 45 If you change this, you should also change `sentence-end'. See Info |
46 node `Sentences'." | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
47 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
48 :group 'fill) |
638 | 49 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
50 (defcustom colon-double-space nil |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
51 "*Non-nil means put two spaces after a colon when filling." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
52 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
53 :group 'fill) |
12752
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
54 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
55 (defcustom sentence-end-without-period nil |
32230 | 56 "*Non-nil means a sentence will end without a period. |
57 For example, a sentence in Thai text ends with double space but | |
58 without a period." | |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
59 :type 'boolean |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
60 :group 'fill) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
61 |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
62 (defvar fill-paragraph-function nil |
13839
d597ac78b00e
(fill-paragraph-function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13713
diff
changeset
|
63 "Mode-specific function to fill a paragraph, or nil if there is none. |
d597ac78b00e
(fill-paragraph-function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13713
diff
changeset
|
64 If the function returns nil, then `fill-paragraph' does its normal work.") |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
65 |
17852
a9f18d920c11
(enable-kinsoku): Name changed form do-kinsoku.
Kenichi Handa <handa@m17n.org>
parents:
17664
diff
changeset
|
66 (defvar enable-kinsoku t |
19239
8298b8a6a47d
(enable-kinsoku): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19220
diff
changeset
|
67 "*Non-nil means enable \"kinsoku\" processing on filling paragraph. |
8298b8a6a47d
(enable-kinsoku): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19220
diff
changeset
|
68 Kinsoku processing is designed to prevent certain characters from being |
8298b8a6a47d
(enable-kinsoku): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19220
diff
changeset
|
69 placed at the beginning or end of a line by filling. |
8298b8a6a47d
(enable-kinsoku): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19220
diff
changeset
|
70 See the documentation of `kinsoku' for more information.") |
16998 | 71 |
75 | 72 (defun set-fill-prefix () |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
73 "Set the fill prefix to the current line up to point. |
218 | 74 Filling expects lines to start with the fill prefix and |
75 reinserts the fill prefix in each resulting line." | |
75 | 76 (interactive) |
77 (setq fill-prefix (buffer-substring | |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
78 (save-excursion (move-to-left-margin) (point)) |
75 | 79 (point))) |
80 (if (equal fill-prefix "") | |
81 (setq fill-prefix nil)) | |
82 (if fill-prefix | |
83 (message "fill-prefix: \"%s\"" fill-prefix) | |
84 (message "fill-prefix cancelled"))) | |
85 | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
86 (defcustom adaptive-fill-mode t |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
87 "*Non-nil means determine a paragraph's fill prefix from its text." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
88 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
89 :group 'fill) |
218 | 90 |
32230 | 91 (defcustom adaptive-fill-regexp |
92 (purecopy "[ \t]*\\([-|#;>*]+ *\\|(?[0-9]+[.)] *\\)*") | |
218 | 93 "*Regexp to match text at start of line that constitutes indentation. |
18221
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
94 If Adaptive Fill mode is enabled, a prefix matching this pattern |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
95 on the first and second lines of a paragraph is used as the |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
96 standard indentation for the whole paragraph. |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
97 |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
98 If the paragraph has just one line, the indentation is taken from that |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
99 line, but in that case `adaptive-fill-first-line-regexp' also plays |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
100 a role." |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
101 :type 'regexp |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
102 :group 'fill) |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
103 |
19076
457a082715c8
(adaptive-fill-first-line-regexp): Fix regexp.
Richard M. Stallman <rms@gnu.org>
parents:
19010
diff
changeset
|
104 (defcustom adaptive-fill-first-line-regexp "\\`[ \t]*\\'" |
18221
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
105 "*Regexp specifying whether to set fill prefix from a one-line paragraph. |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
106 When a paragraph has just one line, then after `adaptive-fill-regexp' |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
107 finds the prefix at the beginning of the line, if it doesn't |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
108 match this regexp, it is replaced with whitespace. |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
109 |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
110 By default, this regexp matches sequences of just spaces and tabs. |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
111 |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
112 However, we never use a prefix from a one-line paragraph |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
113 if it would act as a paragraph-starter on the second line." |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
114 :type 'regexp |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
115 :group 'fill) |
218 | 116 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
117 (defcustom adaptive-fill-function nil |
12752
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
118 "*Function to call to choose a fill prefix for a paragraph. |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
119 This function is used when `adaptive-fill-regexp' does not match." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
120 :type 'function |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
121 :group 'fill) |
12752
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
122 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
123 (defun current-fill-column () |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
124 "Return the fill-column to use for this line. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
125 The fill-column to use for a buffer is stored in the variable `fill-column', |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
126 but can be locally modified by the `right-margin' text property, which is |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
127 subtracted from `fill-column'. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
128 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
129 The fill column to use for a line is the first column at which the column |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
130 number equals or exceeds the local fill-column - right-margin difference." |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
131 (save-excursion |
12429
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
132 (if fill-column |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
133 (let* ((here (progn (beginning-of-line) (point))) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
134 (here-col 0) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
135 (eol (progn (end-of-line) (point))) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
136 margin fill-col change col) |
32230 | 137 ;; Look separately at each region of line with a different |
138 ;; right-margin. | |
12429
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
139 (while (and (setq margin (get-text-property here 'right-margin) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
140 fill-col (- fill-column (or margin 0)) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
141 change (text-property-not-all |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
142 here eol 'right-margin margin)) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
143 (progn (goto-char (1- change)) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
144 (setq col (current-column)) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
145 (< col fill-col))) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
146 (setq here change |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
147 here-col col)) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
148 (max here-col fill-col))))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
149 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
150 (defun canonically-space-region (beg end) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
151 "Remove extra spaces between words in region. |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
152 Leave one space between words, two at end of sentences or after colons |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
153 \(depending on values of `sentence-end-double-space', `colon-double-space', |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
154 and `sentence-end-without-period'). |
12557
34e9427fe8f5
(canonically-space-region): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
12429
diff
changeset
|
155 Remove indentation from each line." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
156 (interactive "*r") |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
157 (save-excursion |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
158 (goto-char beg) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
159 ;; Nuke tabs; they get screwed up in a fill. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
160 ;; This is quick, but loses when a tab follows the end of a sentence. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
161 ;; Actually, it is difficult to tell that from "Mr.\tSmith". |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
162 ;; Blame the typist. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
163 (subst-char-in-region beg end ?\t ?\ ) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
164 (while (and (< (point) end) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
165 (re-search-forward " *" end t)) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
166 (delete-region |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
167 (+ (match-beginning 0) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
168 ;; Determine number of spaces to leave: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
169 (save-excursion |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
170 (skip-chars-backward " ]})\"'") |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
171 (cond ((and sentence-end-double-space |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
172 (or (memq (preceding-char) '(?. ?? ?!)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
173 (and sentence-end-without-period |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
174 (= (char-syntax (preceding-char)) ?w)))) 2) |
12752
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
175 ((and colon-double-space |
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
176 (= (preceding-char) ?:)) 2) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
177 ((char-equal (preceding-char) ?\n) 0) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
178 (t 1)))) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
179 (match-end 0))) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
180 ;; Make sure sentences ending at end of line get an extra space. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
181 ;; loses on split abbrevs ("Mr.\nSmith") |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
182 (goto-char beg) |
25606
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
183 (let ((eol-double-space-re (if colon-double-space |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
184 "[.?!:][])}\"']*$" |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
185 "[.?!][])}\"']*$"))) |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
186 (while (and (< (point) end) |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
187 (re-search-forward eol-double-space-re end t)) |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
188 ;; We insert before markers in case a caller such as |
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
189 ;; do-auto-fill has done a save-excursion with point at the end |
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
190 ;; of the line and wants it to stay at the end of the line. |
25606
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
191 (insert-before-markers-and-inherit ? ))))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
192 |
27287
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
193 (defun fill-common-string-prefix (s1 s2) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
194 "Return the longest common prefix of strings S1 and S2, or nil if none." |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
195 (let ((cmp (compare-strings s1 nil nil s2 nil nil))) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
196 (if (eq cmp t) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
197 s1 |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
198 (setq cmp (1- (abs cmp))) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
199 (unless (zerop cmp) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
200 (substring s1 0 cmp))))) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
201 |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
202 (defun fill-context-prefix (from to &optional first-line-regexp) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
203 "Compute a fill prefix from the text between FROM and TO. |
25126
9b5a39995216
(fill-context-prefix): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
25088
diff
changeset
|
204 This uses the variables `adaptive-fill-regexp' and `adaptive-fill-function' |
18221
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
205 and `adaptive-fill-first-line-regexp'. `paragraph-start' also plays a role; |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
206 we reject a prefix based on a one-line paragraph if that prefix would |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
207 act as a paragraph-separator." |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
208 (or first-line-regexp |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
209 (setq first-line-regexp adaptive-fill-first-line-regexp)) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
210 (save-excursion |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
211 (goto-char from) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
212 (if (eolp) (forward-line 1)) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
213 ;; Move to the second line unless there is just one. |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
214 (let ((firstline (point)) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
215 first-line-prefix |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
216 ;; Non-nil if we are on the second line. |
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
217 at-second |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
218 second-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
219 start) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
220 (move-to-left-margin) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
221 (setq start (point)) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
222 (setq first-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
223 (cond ((looking-at paragraph-start) nil) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
224 ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp)) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
225 (buffer-substring-no-properties start (match-end 0))) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
226 (adaptive-fill-function (funcall adaptive-fill-function)))) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
227 (forward-line 1) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
228 (if (>= (point) to) |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
229 (goto-char firstline) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
230 (setq at-second t) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
231 (move-to-left-margin) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
232 (setq start (point)) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
233 (setq second-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
234 (cond ((looking-at paragraph-start) nil) |
32230 | 235 ((and adaptive-fill-regexp |
236 (looking-at adaptive-fill-regexp)) | |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
237 (buffer-substring-no-properties start (match-end 0))) |
32230 | 238 (adaptive-fill-function |
239 (funcall adaptive-fill-function))))) | |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
240 (if at-second |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
241 ;; If we get a fill prefix from the second line, |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
242 ;; make sure it or something compatible is on the first line too. |
18319
a685286cc17f
(fill-context-prefix): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18283
diff
changeset
|
243 (and second-line-prefix first-line-prefix |
19220
4a2dbee243f9
(fill-context-prefix): Accept a whitespace
Richard M. Stallman <rms@gnu.org>
parents:
19076
diff
changeset
|
244 ;; If the first line has the second line prefix too, use it. |
19010
baf7d9450075
(fill-context-prefix): Be stricter about
Richard M. Stallman <rms@gnu.org>
parents:
18664
diff
changeset
|
245 (if (or (string-match (concat "\\`" |
baf7d9450075
(fill-context-prefix): Be stricter about
Richard M. Stallman <rms@gnu.org>
parents:
18664
diff
changeset
|
246 (regexp-quote second-line-prefix) |
baf7d9450075
(fill-context-prefix): Be stricter about
Richard M. Stallman <rms@gnu.org>
parents:
18664
diff
changeset
|
247 "\\(\\'\\|[ \t]\\)") |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
248 first-line-prefix) |
19220
4a2dbee243f9
(fill-context-prefix): Accept a whitespace
Richard M. Stallman <rms@gnu.org>
parents:
19076
diff
changeset
|
249 ;; If the second line prefix is whitespace, use it. |
4a2dbee243f9
(fill-context-prefix): Accept a whitespace
Richard M. Stallman <rms@gnu.org>
parents:
19076
diff
changeset
|
250 (string-match "\\`[ \t]+\\'" second-line-prefix)) |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
251 second-line-prefix |
27287
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
252 |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
253 ;; If using the common prefix of first-line-prefix |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
254 ;; and second-line-prefix leads to problems, consider |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
255 ;; to restore the code below that's commented out, |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
256 ;; and document why a common prefix cannot be used. |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
257 |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
258 ; ;; If the second line has the first line prefix, |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
259 ; ;; plus whitespace, use the part that the first line shares. |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
260 ; (if (string-match (concat "\\`" |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
261 ; (regexp-quote first-line-prefix) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
262 ; "[ \t]*\\'") |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
263 ; second-line-prefix) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
264 ; first-line-prefix))) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
265 |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
266 ;; Use the longest common substring of both prefixes, |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
267 ;; if there is one. |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
268 (fill-common-string-prefix first-line-prefix |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
269 second-line-prefix))) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
270 ;; If we get a fill prefix from a one-line paragraph, |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
271 ;; maybe change it to whitespace, |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
272 ;; and check that it isn't a paragraph starter. |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
273 (if first-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
274 (let ((result |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
275 ;; If first-line-prefix comes from the first line, |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
276 ;; see if it seems reasonable to use for all lines. |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
277 ;; If not, replace it with whitespace. |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
278 (if (or (and first-line-regexp |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
279 (string-match first-line-regexp |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
280 first-line-prefix)) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
281 (and comment-start-skip |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
282 (string-match comment-start-skip |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
283 first-line-prefix))) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
284 first-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
285 (make-string (string-width first-line-prefix) ?\ )))) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
286 ;; But either way, reject it if it indicates the start |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
287 ;; of a paragraph when text follows it. |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
288 (if (not (eq 0 (string-match paragraph-start |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
289 (concat result "a")))) |
18283 | 290 result))))))) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
291 |
21123
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
292 (defvar fill-nobreak-predicate nil |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
293 "If non-nil, a predicate for recognizing places not to break a line. |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
294 The predicate is called with no arguments, with point at the place |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
295 to be tested. If it returns t, fill commands do not break the line there.") |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
296 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
297 ;; Put `fill-find-break-point-function' property to charsets which |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
298 ;; require special functions to find line breaking point. |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
299 (let ((alist '((katakana-jisx0201 . kinsoku) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
300 (chinese-gb2312 . kinsoku) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
301 (japanese-jisx0208 . kinsoku) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
302 (japanese-jisx0212 . kinsoku) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
303 (chinese-big5-1 . kinsoku) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
304 (chinese-big5-2 . kinsoku)))) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
305 (while alist |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
306 (put-charset-property (car (car alist)) 'fill-find-break-point-function |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
307 (cdr (car alist))) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
308 (setq alist (cdr alist)))) |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
309 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
310 (defun fill-find-break-point (limit) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
311 "Move point to a proper line breaking position of the current line. |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
312 Don't move back past the buffer position LIMIT. |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
313 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
314 This function is called when we are going to break the current line |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
315 after or before a non-ascii character. If the charset of the |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
316 character has the property `fill-find-break-point-function', this |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
317 function calls the property value as a function with one arg LINEBEG. |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
318 If the charset has no such property, do nothing." |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
319 (let* ((ch (following-char)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
320 (charset (char-charset ch)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
321 func) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
322 (if (eq charset 'ascii) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
323 (setq ch (preceding-char) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
324 charset (char-charset ch))) |
29484
59d0015683a5
(fill-find-break-point): Check the validity of charset.
Kenichi Handa <handa@m17n.org>
parents:
28489
diff
changeset
|
325 (if (charsetp charset) |
59d0015683a5
(fill-find-break-point): Check the validity of charset.
Kenichi Handa <handa@m17n.org>
parents:
28489
diff
changeset
|
326 (setq func |
59d0015683a5
(fill-find-break-point): Check the validity of charset.
Kenichi Handa <handa@m17n.org>
parents:
28489
diff
changeset
|
327 (get-charset-property charset 'fill-find-break-point-function))) |
26898
182d67795a5b
(fill-find-break-point): Delete codes for
Kenichi Handa <handa@m17n.org>
parents:
25606
diff
changeset
|
328 (if (and func (fboundp func)) |
182d67795a5b
(fill-find-break-point): Delete codes for
Kenichi Handa <handa@m17n.org>
parents:
25606
diff
changeset
|
329 (funcall func limit)))) |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
330 |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
331 (defun fill-region-as-paragraph (from to &optional justify |
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
332 nosqueeze squeeze-after) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
333 "Fill the region as one paragraph. |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
334 It removes any paragraph breaks in the region and extra newlines at the end, |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
335 indents and fills lines between the margins given by the |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
336 `current-left-margin' and `current-fill-column' functions. |
18664 | 337 \(In most cases, the variable `fill-column' controls the width.) |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
338 It leaves point at the beginning of the line following the paragraph. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
339 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
340 Normally performs justification according to the `current-justification' |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
341 function, but with a prefix arg, does full justification instead. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
342 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
343 From a program, optional third arg JUSTIFY can specify any type of |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
344 justification. Fourth arg NOSQUEEZE non-nil means not to make spaces |
14645
875c14f0d0db
(fill-region-as-paragraph): Doc fix.
Erik Naggum <erik@naggum.no>
parents:
14621
diff
changeset
|
345 between words canonical before filling. Fifth arg SQUEEZE-AFTER, if non-nil, |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
346 means don't canonicalize spaces before that position. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
347 |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
348 If `sentence-end-double-space' is non-nil, then period followed by one |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
349 space does not end a sentence, so don't break a line there." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
350 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
351 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
352 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
353 (if current-prefix-arg 'full)))) |
21150
a9e9f674c9c9
(fill-region-as-paragraph, fill-region): Allow t as legit value of JUSTIFY.
Richard M. Stallman <rms@gnu.org>
parents:
21123
diff
changeset
|
354 (unless (memq justify '(t nil none full center left right)) |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
355 (setq justify 'full)) |
1332
955ebdb98095
(fill-paragraph): Don't actually change point before
Richard M. Stallman <rms@gnu.org>
parents:
1067
diff
changeset
|
356 ;; 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
|
357 (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
|
358 (setq buffer-undo-list (cons (point) buffer-undo-list))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
359 |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
360 ;; Make sure "to" is the endpoint. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
361 (goto-char (min from to)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
362 (setq to (max from to)) |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
363 ;; Ignore blank lines at beginning of region. |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
364 (skip-chars-forward " \t\n") |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
365 |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
366 (let ((from-plus-indent (point)) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
367 (oneleft nil)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
368 |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
369 (beginning-of-line) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
370 (setq from (point)) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
371 |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
372 ;; Delete all but one soft newline at end of region. |
14113
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
373 ;; And leave TO before that one. |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
374 (goto-char to) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
375 (while (and (> (point) from) (eq ?\n (char-after (1- (point))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
376 (if (and oneleft |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
377 (not (and use-hard-newlines |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
378 (get-text-property (1- (point)) 'hard)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
379 (delete-backward-char 1) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
380 (backward-char 1) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
381 (setq oneleft t))) |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
382 (setq to (point)) |
22198
74d1c031f824
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
21727
diff
changeset
|
383 ;;; ;; If there was no newline, and there is text in the paragraph, then |
74d1c031f824
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
21727
diff
changeset
|
384 ;;; ;; create a newline. |
74d1c031f824
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
21727
diff
changeset
|
385 ;;; (if (and (not oneleft) (> to from-plus-indent)) |
74d1c031f824
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
21727
diff
changeset
|
386 ;;; (newline)) |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
387 (goto-char from-plus-indent)) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
388 |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
389 (if (not (> to (point))) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
390 nil ; There is no paragraph, only whitespace: exit now. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
391 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
392 (or justify (setq justify (current-justification))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
393 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
394 ;; Don't let Adaptive Fill mode alter the fill prefix permanently. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
395 (let ((fill-prefix fill-prefix)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
396 ;; Figure out how this paragraph is indented, if desired. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
397 (if (and adaptive-fill-mode |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
398 (or (null fill-prefix) (string= fill-prefix ""))) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
399 (setq fill-prefix (fill-context-prefix from to))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
400 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
401 (save-restriction |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
402 (goto-char from) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
403 (beginning-of-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
404 (narrow-to-region (point) to) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
405 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
406 (if (not justify) ; filling disabled: just check indentation |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
407 (progn |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
408 (goto-char from) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
409 (while (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
410 (if (and (not (eolp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
411 (< (current-indentation) (current-left-margin))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
412 (indent-to-left-margin)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
413 (forward-line 1))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
414 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
415 (if use-hard-newlines |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
416 (remove-text-properties from (point-max) '(hard nil))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
417 ;; Make sure first line is indented (at least) to left margin... |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
418 (if (or (memq justify '(right center)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
419 (< (current-indentation) (current-left-margin))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
420 (indent-to-left-margin)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
421 ;; Delete the fill prefix from every line except the first. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
422 ;; The first line may not even have a fill prefix. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
423 (goto-char from) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
424 (let ((fpre (and fill-prefix (not (equal fill-prefix "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
425 (concat "[ \t]*" |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
426 (regexp-quote fill-prefix) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
427 "[ \t]*")))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
428 (and fpre |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
429 (progn |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
430 (if (>= (+ (current-left-margin) (length fill-prefix)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
431 (current-fill-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
432 (error "fill-prefix too long for specified width")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
433 (goto-char from) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
434 (forward-line 1) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
435 (while (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
436 (if (looking-at fpre) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
437 (delete-region (point) (match-end 0))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
438 (forward-line 1)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
439 (goto-char from) |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
440 (if (looking-at fpre) |
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
441 (goto-char (match-end 0))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
442 (setq from (point))))) |
11178
7d4805feb413
(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
Richard M. Stallman <rms@gnu.org>
parents:
10989
diff
changeset
|
443 ;; Remove indentation from lines other than the first. |
7d4805feb413
(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
Richard M. Stallman <rms@gnu.org>
parents:
10989
diff
changeset
|
444 (beginning-of-line 2) |
7d4805feb413
(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
Richard M. Stallman <rms@gnu.org>
parents:
10989
diff
changeset
|
445 (indent-region (point) (point-max) 0) |
7d4805feb413
(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
Richard M. Stallman <rms@gnu.org>
parents:
10989
diff
changeset
|
446 (goto-char from) |
7d4805feb413
(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
Richard M. Stallman <rms@gnu.org>
parents:
10989
diff
changeset
|
447 |
7d4805feb413
(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
Richard M. Stallman <rms@gnu.org>
parents:
10989
diff
changeset
|
448 ;; FROM, and point, are now before the text to fill, |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
449 ;; but after any fill prefix on the first line. |
218 | 450 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
451 ;; Make sure sentences ending at end of line get an extra space. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
452 ;; loses on split abbrevs ("Mr.\nSmith") |
25606
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
453 (let ((eol-double-space-re (if colon-double-space |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
454 "[.?!:][])}\"']*$" |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
455 "[.?!][])}\"']*$"))) |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
456 (while (re-search-forward eol-double-space-re nil t) |
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
457 (or (eobp) (insert-and-inherit ?\ )))) |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
458 |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
459 (goto-char from) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
460 (if enable-multibyte-characters |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
461 ;; Delete unnecessay newlines surrounded by words. The |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
462 ;; character category `|' means that we can break a line |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
463 ;; at the character. And, charset property |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
464 ;; `nospace-between-words' tells how to concatenate |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
465 ;; words. If the value is non-nil, never put spaces |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
466 ;; between words, thus delete a newline between them. |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
467 ;; If the value is nil, delete a newline only when a |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
468 ;; character preceding a newline has text property |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
469 ;; `nospace-between-words'. |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
470 (while (search-forward "\n" nil t) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
471 (let ((prev (char-before (match-beginning 0))) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
472 (next (following-char))) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
473 (if (and (or (aref (char-category-set next) ?|) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
474 (aref (char-category-set prev) ?|)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
475 (or (get-charset-property (char-charset prev) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
476 'nospace-between-words) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
477 (get-text-property (1- (match-beginning 0)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
478 'nospace-between-words))) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
479 (delete-char -1))))) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
480 |
16998 | 481 (goto-char from) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
482 (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
483 ;; Then change all newlines to spaces. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
484 (subst-char-in-region from (point-max) ?\n ?\ ) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
485 (if (and nosqueeze (not (eq justify 'full))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
486 nil |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
487 (canonically-space-region (or squeeze-after (point)) (point-max)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
488 (goto-char (point-max)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
489 (delete-horizontal-space) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
490 (insert-and-inherit " ")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
491 (goto-char (point-min)) |
218 | 492 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
493 ;; This is the actual filling loop. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
494 (let ((prefixcol 0) linebeg) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
495 (while (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
496 (setq linebeg (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
497 (move-to-column (1+ (current-fill-column))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
498 (if (eobp) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
499 (or nosqueeze (delete-horizontal-space)) |
16998 | 500 ;; Move back to the point where we can break the line |
501 ;; at. We break the line between word or after/before | |
502 ;; the character which has character category `|'. We | |
503 ;; search space, \c| followed by a character, or \c| | |
504 ;; following a character. If not found, place | |
505 ;; the point at linebeg. | |
506 (if (re-search-backward " \\|\\c|.\\|.\\c|" linebeg 0) | |
507 ;; In case of space, we place the point at next to | |
508 ;; the point where the break occurs acutually, | |
509 ;; because we don't want to change the following | |
510 ;; logic of original Emacs. In case of \c|, the | |
511 ;; point is at the place where the break occurs. | |
512 (forward-char 1)) | |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
513 ;; Don't break after a period followed by just one space. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
514 ;; Move back to the previous place to break. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
515 ;; The reason is that if a period ends up at the end of a line, |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
516 ;; further fills will assume it ends a sentence. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
517 ;; If we now know it does not end a sentence, |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
518 ;; avoid putting it at the end of the line. |
21123
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
519 (while (or (and sentence-end-double-space |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
520 (> (point) (+ linebeg 2)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
521 (eq (preceding-char) ?\ ) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
522 (not (eq (following-char) ?\ )) |
21123
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
523 (eq (char-after (- (point) 2)) ?\.) |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
524 (progn (forward-char -2) t)) |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
525 (and fill-nobreak-predicate |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
526 (funcall fill-nobreak-predicate) |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
527 (goto-char (match-beginning 0)))) |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
528 (if (re-search-backward " \\|\\c|.\\|.\\c|" linebeg 0) |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
529 (forward-char 1))) |
13549
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
530 ;; If the left margin and fill prefix by themselves |
14840
dfbf6fd50825
(fill-region-as-paragraph): Fix the second check for
Richard M. Stallman <rms@gnu.org>
parents:
14827
diff
changeset
|
531 ;; pass the fill-column. or if they are zero |
dfbf6fd50825
(fill-region-as-paragraph): Fix the second check for
Richard M. Stallman <rms@gnu.org>
parents:
14827
diff
changeset
|
532 ;; but we have no room for even one word, |
16998 | 533 ;; keep at least one word or a character which has |
534 ;; category `|'anyway . | |
13549
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
535 ;; This handles ALL BUT the first line of the paragraph. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
536 (if (if (zerop prefixcol) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
537 (save-excursion |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
538 (skip-chars-backward " \t" linebeg) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
539 (bolp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
540 (>= prefixcol (current-column))) |
16998 | 541 ;; Ok, skip at least one word or one \c| character. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
542 ;; Meanwhile, don't stop at a period followed by one space. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
543 (let ((first t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
544 (move-to-column prefixcol) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
545 (while (and (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
546 (or first |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
547 (and (not (bobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
548 sentence-end-double-space |
32230 | 549 (save-excursion |
550 (forward-char -1) | |
551 (and (looking-at "\\. ") | |
552 (not (looking-at "\\. "))))) | |
21123
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
553 (and fill-nobreak-predicate |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
554 (funcall fill-nobreak-predicate)))) |
20234
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
555 ;; Find a breakable point while ignoring the |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
556 ;; following spaces. |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
557 (skip-chars-forward " \t") |
20234
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
558 (if (looking-at "\\c|") |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
559 (forward-char 1) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
560 (let ((pos (save-excursion |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
561 (skip-chars-forward "^ \n\t") |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
562 (point)))) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
563 (if (re-search-forward "\\c|" pos t) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
564 (forward-char -1) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
565 (goto-char pos)))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
566 (setq first nil))) |
32230 | 567 ;; Normally, move back over the single space between |
568 ;; the words. | |
16998 | 569 (if (= (preceding-char) ?\ ) (forward-char -1)) |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
570 |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
571 (if enable-multibyte-characters |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
572 ;; If we are going to break the line after or |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
573 ;; before a non-ascii character, we may have to |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
574 ;; run a special function for the charset of the |
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
575 ;; character to find the correct break point. |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
576 (if (not (and (eq (charset-after (1- (point))) 'ascii) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
577 (eq (charset-after (point)) 'ascii))) |
25088
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
578 ;; Make sure we take SOMETHING after the |
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
579 ;; fill prefix if any. |
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
580 (fill-find-break-point |
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
581 (save-excursion |
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
582 (goto-char linebeg) |
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
583 (move-to-column prefixcol) |
4b9caa006ac3
(fill-region-as-paragraph): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
25061
diff
changeset
|
584 (point)))))) |
16998 | 585 |
13549
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
586 ;; If the left margin and fill prefix by themselves |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
587 ;; pass the fill-column, keep at least one word. |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
588 ;; This handles the first line of the paragraph. |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
589 (if (and (zerop prefixcol) |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
590 (let ((fill-point (point)) nchars) |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
591 (save-excursion |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
592 (move-to-left-margin) |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
593 (setq nchars (- fill-point (point))) |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
594 (or (< nchars 0) |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
595 (and fill-prefix |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
596 (< nchars (length fill-prefix)) |
32230 | 597 (string= (buffer-substring (point) |
598 fill-point) | |
599 (substring fill-prefix | |
600 0 nchars))))))) | |
13549
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
601 ;; Ok, skip at least one word. But |
f8afa95d197e
(fill-region-as-paragraph): Handle left margin extending to or past
Richard M. Stallman <rms@gnu.org>
parents:
13548
diff
changeset
|
602 ;; don't stop at a period followed by just one space. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
603 (let ((first t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
604 (while (and (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
605 (or first |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
606 (and (not (bobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
607 sentence-end-double-space |
32230 | 608 (save-excursion |
609 (forward-char -1) | |
610 (and (looking-at "\\. ") | |
611 (not (looking-at "\\. "))))) | |
21123
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
612 (and fill-nobreak-predicate |
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
613 (funcall fill-nobreak-predicate)))) |
20234
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
614 ;; Find a breakable point while ignoring the |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
615 ;; following spaces. |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
616 (skip-chars-forward " \t") |
20234
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
617 (if (looking-at "\\c|") |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
618 (forward-char 1) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
619 (let ((pos (save-excursion |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
620 (skip-chars-forward "^ \n\t") |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
621 (point)))) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
622 (if (re-search-forward "\\c|" pos t) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
623 (forward-char -1) |
a21b3ed1915e
(fill-region-as-paragraph): Fix bug of
Kenichi Handa <handa@m17n.org>
parents:
19929
diff
changeset
|
624 (goto-char pos)))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
625 (setq first nil)))) |
14113
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
626 ;; Check again to see if we got to the end of the paragraph. |
14840
dfbf6fd50825
(fill-region-as-paragraph): Fix the second check for
Richard M. Stallman <rms@gnu.org>
parents:
14827
diff
changeset
|
627 (if (save-excursion (skip-chars-forward " \t") (eobp)) |
14113
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
628 (or nosqueeze (delete-horizontal-space)) |
32230 | 629 ;; Replace whitespace here with one newline, then |
630 ;; indent to left margin. | |
14113
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
631 (skip-chars-backward " \t") |
16998 | 632 (if (and (= (following-char) ?\ ) |
633 (or (aref (char-category-set (preceding-char)) ?|) | |
634 (looking-at "[ \t]+\\c|"))) | |
635 ;; We need one space at end of line so that | |
636 ;; further filling won't delete it. NOTE: We | |
637 ;; intentionally leave this one space to | |
638 ;; distingush the case that user wants to put | |
639 ;; space between \c| characters. | |
640 (forward-char 1)) | |
14113
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
641 (insert ?\n) |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
642 ;; Give newline the properties of the space(s) it replaces |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
643 (set-text-properties (1- (point)) (point) |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
644 (text-properties-at (point))) |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
645 (indent-to-left-margin) |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
646 ;; Insert the fill prefix after indentation. |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
647 ;; Set prefixcol so whitespace in the prefix won't get lost. |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
648 (and fill-prefix (not (equal fill-prefix "")) |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
649 (progn |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
650 (insert-and-inherit fill-prefix) |
dfbb4ab9bee1
(fill-region-as-paragraph): Check again for reaching
Karl Heuer <kwzh@gnu.org>
parents:
13981
diff
changeset
|
651 (setq prefixcol (current-column)))))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
652 ;; Justify the line just ended, if desired. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
653 (if justify |
19317
09398d892cf7
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
19239
diff
changeset
|
654 (if (save-excursion (skip-chars-forward " \t") (eobp)) |
09398d892cf7
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
19239
diff
changeset
|
655 (progn |
09398d892cf7
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
19239
diff
changeset
|
656 (delete-horizontal-space) |
09398d892cf7
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
19239
diff
changeset
|
657 (justify-current-line justify t t)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
658 (forward-line -1) |
11356
4be78e93d1be
(fill-region-as-paragraph): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
11282
diff
changeset
|
659 (justify-current-line justify nil t) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
660 (forward-line 1)))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
661 ;; Leave point after final newline. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
662 (goto-char (point-max))) |
22198
74d1c031f824
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
21727
diff
changeset
|
663 (unless (eobp) |
74d1c031f824
(fill-region-as-paragraph):
Richard M. Stallman <rms@gnu.org>
parents:
21727
diff
changeset
|
664 (forward-char 1))))) |
75 | 665 |
666 (defun fill-paragraph (arg) | |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
667 "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
|
668 If `sentence-end-double-space' is non-nil, then period followed by one |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
669 space does not end a sentence, so don't break a line there. |
18664 | 670 the variable `fill-column' controls the width for filling. |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
671 |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
672 If `fill-paragraph-function' is non-nil, we call it (passing our |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
673 argument to it), and if it returns non-nil, we simply return its value." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
674 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
675 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
676 (list (if current-prefix-arg 'full)))) |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
677 (or (and fill-paragraph-function |
10636
6f9d0e697678
(fill-paragraph): Bind fill-paragraph-function to nil before calling it.
Richard M. Stallman <rms@gnu.org>
parents:
10631
diff
changeset
|
678 (let ((function fill-paragraph-function) |
6f9d0e697678
(fill-paragraph): Bind fill-paragraph-function to nil before calling it.
Richard M. Stallman <rms@gnu.org>
parents:
10631
diff
changeset
|
679 fill-paragraph-function) |
6f9d0e697678
(fill-paragraph): Bind fill-paragraph-function to nil before calling it.
Richard M. Stallman <rms@gnu.org>
parents:
10631
diff
changeset
|
680 (funcall function arg))) |
22367 | 681 (let ((before (point)) |
682 ;; If fill-paragraph is called recursively, | |
683 ;; don't give fill-paragraph-function a second chance. | |
684 fill-paragraph-function) | |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
685 (save-excursion |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
686 (forward-paragraph) |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
687 (or (bolp) (newline 1)) |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
688 (let ((end (point)) |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
689 (beg (progn (backward-paragraph) (point)))) |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
690 (goto-char before) |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
691 (if use-hard-newlines |
32230 | 692 ;; Can't use fill-region-as-paragraph, since this paragraph |
693 ;; may still contain hard newlines. See fill-region. | |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
694 (fill-region beg end arg) |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
695 (fill-region-as-paragraph beg end arg))))))) |
75 | 696 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
697 (defun fill-region (from to &optional justify nosqueeze to-eop) |
75 | 698 "Fill each of the paragraphs in the region. |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
699 A prefix arg means justify as well. |
18664 | 700 Ordinarily the variable `fill-column' controls the width. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
701 |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
702 Noninteractively, the third argument JUSTIFY specifies which |
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
703 kind of justification to do: `full', `left', `right', `center', |
21150
a9e9f674c9c9
(fill-region-as-paragraph, fill-region): Allow t as legit value of JUSTIFY.
Richard M. Stallman <rms@gnu.org>
parents:
21123
diff
changeset
|
704 or `none' (equivalent to nil). t means handle each paragraph |
a9e9f674c9c9
(fill-region-as-paragraph, fill-region): Allow t as legit value of JUSTIFY.
Richard M. Stallman <rms@gnu.org>
parents:
21123
diff
changeset
|
705 as specified by its text properties. |
a9e9f674c9c9
(fill-region-as-paragraph, fill-region): Allow t as legit value of JUSTIFY.
Richard M. Stallman <rms@gnu.org>
parents:
21123
diff
changeset
|
706 |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
707 The fourth arg NOSQUEEZE non-nil means to leave |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
708 whitespace other than line breaks untouched, and fifth arg TO-EOP |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
709 non-nil means to keep filling to the end of the paragraph (or next |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
710 hard newline, if `use-hard-newlines' is on). |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
711 |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
712 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
|
713 space does not end a sentence, so don't break a line there." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
714 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
715 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
716 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
717 (if current-prefix-arg 'full)))) |
21150
a9e9f674c9c9
(fill-region-as-paragraph, fill-region): Allow t as legit value of JUSTIFY.
Richard M. Stallman <rms@gnu.org>
parents:
21123
diff
changeset
|
718 (unless (memq justify '(t nil none full center left right)) |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
719 (setq justify 'full)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
720 (let (end beg) |
10110
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
721 (save-restriction |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
722 (goto-char (max from to)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
723 (if to-eop |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
724 (progn (skip-chars-backward "\n") |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
725 (forward-paragraph))) |
10110
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
726 (setq end (point)) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
727 (goto-char (setq beg (min from to))) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
728 (beginning-of-line) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
729 (narrow-to-region (point) end) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
730 (while (not (eobp)) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
731 (let ((initial (point)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
732 end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
733 ;; If using hard newlines, break at every one for filling |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
734 ;; purposes rather than using paragraph breaks. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
735 (if use-hard-newlines |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
736 (progn |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
737 (while (and (setq end (text-property-any (point) (point-max) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
738 'hard t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
739 (not (= ?\n (char-after end))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
740 (not (= end (point-max)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
741 (goto-char (1+ end))) |
11282
3da60d3584c4
(fill-region): Avoid error on reaching end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
11247
diff
changeset
|
742 (setq end (if end (min (point-max) (1+ end)) (point-max))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
743 (goto-char initial)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
744 (forward-paragraph 1) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
745 (setq end (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
746 (forward-paragraph -1)) |
10110
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
747 (if (< (point) beg) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
748 (goto-char beg)) |
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
749 (if (>= (point) initial) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
750 (fill-region-as-paragraph (point) end justify nosqueeze) |
10110
18d52489f138
(fill-region-as-paragraph): If region starts in mid-line,
Richard M. Stallman <rms@gnu.org>
parents:
9706
diff
changeset
|
751 (goto-char end))))))) |
75 | 752 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
753 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
754 (defcustom default-justification 'left |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
755 "*Method of justifying text not otherwise specified. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
756 Possible values are `left', `right', `full', `center', or `none'. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
757 The requested kind of justification is done whenever lines are filled. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
758 The `justification' text-property can locally override this variable. |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
759 This variable automatically becomes buffer-local when set in any fashion." |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
760 :type '(choice (const left) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
761 (const right) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
762 (const full) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
763 (const center) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
764 (const none)) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
765 :group 'fill) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
766 (make-variable-buffer-local 'default-justification) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
767 |
10472
82ff279a4cea
(current-justification): Renamed from current-justification. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
10468
diff
changeset
|
768 (defun current-justification () |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
769 "How should we justify this line? |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
770 This returns the value of the text-property `justification', |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
771 or the variable `default-justification' if there is no text-property. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
772 However, it returns nil rather than `none' to mean \"don't justify\"." |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
773 (let ((j (or (get-text-property |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
774 ;; Make sure we're looking at paragraph body. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
775 (save-excursion (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
776 (if (and (eobp) (not (bobp))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
777 (1- (point)) (point))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
778 'justification) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
779 default-justification))) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
780 (if (eq 'none j) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
781 nil |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
782 j))) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
783 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
784 (defun set-justification (begin end value &optional whole-par) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
785 "Set the region's justification style. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
786 The kind of justification to use is prompted for. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
787 If the mark is not active, this command operates on the current paragraph. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
788 If the mark is active, the region is used. However, if the beginning and end |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
789 of the region are not at paragraph breaks, they are moved to the beginning and |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
790 end of the paragraphs they are in. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
791 If `use-hard-newlines' is true, all hard newlines are taken to be paragraph |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
792 breaks. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
793 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
794 When calling from a program, operates just on region between BEGIN and END, |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
795 unless optional fourth arg WHOLE-PAR is non-nil. In that case bounds are |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
796 extended to include entire paragraphs as in the interactive command." |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
797 (interactive (list (if mark-active (region-beginning) (point)) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
798 (if mark-active (region-end) (point)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
799 (let ((s (completing-read |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
800 "Set justification to: " |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
801 '(("left") ("right") ("full") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
802 ("center") ("none")) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
803 nil t))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
804 (if (equal s "") (error "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
805 (intern s)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
806 t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
807 (save-excursion |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
808 (save-restriction |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
809 (if whole-par |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
810 (let ((paragraph-start (if use-hard-newlines "." paragraph-start)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
811 (paragraph-ignore-fill-prefix (if use-hard-newlines t |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
812 paragraph-ignore-fill-prefix))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
813 (goto-char begin) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
814 (while (and (bolp) (not (eobp))) (forward-char 1)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
815 (backward-paragraph) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
816 (setq begin (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
817 (goto-char end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
818 (skip-chars-backward " \t\n" begin) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
819 (forward-paragraph) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
820 (setq end (point)))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
821 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
822 (narrow-to-region (point-min) end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
823 (unjustify-region begin (point-max)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
824 (put-text-property begin (point-max) 'justification value) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
825 (fill-region begin (point-max) nil t)))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
826 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
827 (defun set-justification-none (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
828 "Disable automatic filling for paragraphs in the region. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
829 If the mark is not active, this applies to the current paragraph." |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
830 (interactive (list (if mark-active (region-beginning) (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
831 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
832 (set-justification b e 'none t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
833 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
834 (defun set-justification-left (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
835 "Make paragraphs in the region left-justified. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
836 This is usually the default, but see the variable `default-justification'. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
837 If the mark is not active, this applies to the current paragraph." |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
838 (interactive (list (if mark-active (region-beginning) (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
839 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
840 (set-justification b e 'left t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
841 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
842 (defun set-justification-right (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
843 "Make paragraphs in the region right-justified: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
844 Flush at the right margin and ragged on the left. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
845 If the mark is not active, this applies to the current paragraph." |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
846 (interactive (list (if mark-active (region-beginning) (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
847 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
848 (set-justification b e 'right t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
849 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
850 (defun set-justification-full (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
851 "Make paragraphs in the region fully justified: |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
852 This makes lines flush on both margins by inserting spaces between words. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
853 If the mark is not active, this applies to the current paragraph." |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
854 (interactive (list (if mark-active (region-beginning) (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
855 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
856 (set-justification b e 'full t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
857 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
858 (defun set-justification-center (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
859 "Make paragraphs in the region centered. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
860 If the mark is not active, this applies to the current paragraph." |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
861 (interactive (list (if mark-active (region-beginning) (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
862 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
863 (set-justification b e 'center t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
864 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
865 ;; A line has up to six parts: |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
866 ;; |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
867 ;; >>> hello. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
868 ;; [Indent-1][FP][ Indent-2 ][text][trailing whitespace][newline] |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
869 ;; |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
870 ;; "Indent-1" is the left-margin indentation; normally it ends at column |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
871 ;; given by the `current-left-margin' function. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
872 ;; "FP" is the fill-prefix. It can be any string, including whitespace. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
873 ;; "Indent-2" is added to justify a line if the `current-justification' is |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
874 ;; `center' or `right'. In `left' and `full' justification regions, any |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
875 ;; whitespace there is part of the line's text, and should not be changed. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
876 ;; Trailing whitespace is not counted as part of the line length when |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
877 ;; center- or right-justifying. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
878 ;; |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
879 ;; All parts of the line are optional, although the final newline can |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
880 ;; only be missing on the last line of the buffer. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
881 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
882 (defun justify-current-line (&optional how eop nosqueeze) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
883 "Do some kind of justification on this line. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
884 Normally does full justification: adds spaces to the line to make it end at |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
885 the column given by `current-fill-column'. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
886 Optional first argument HOW specifies alternate type of justification: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
887 it can be `left', `right', `full', `center', or `none'. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
888 If HOW is t, will justify however the `current-justification' function says to. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
889 If HOW is nil or missing, full justification is done by default. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
890 Second arg EOP non-nil means that this is the last line of the paragraph, so |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
891 it will not be stretched by full justification. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
892 Third arg NOSQUEEZE non-nil means to leave interior whitespace unchanged, |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
893 otherwise it is made canonical." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
894 (interactive "*") |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
895 (if (eq t how) (setq how (or (current-justification) 'none)) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
896 (if (null how) (setq how 'full) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
897 (or (memq how '(none left right center)) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
898 (setq how 'full)))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
899 (or (memq how '(none left)) ; No action required for these. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
900 (let ((fc (current-fill-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
901 (pos (point-marker)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
902 fp-end ; point at end of fill prefix |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
903 beg ; point at beginning of line's text |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
904 end ; point at end of line's text |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
905 indent ; column of `beg' |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
906 endcol ; column of `end' |
21727
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
907 ncols ; new indent point or offset |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
908 (nspaces 0) ; number of spaces between words |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
909 ; in line (not space characters) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
910 fracspace ; fractional amount of space to be |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
911 ; added between each words |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
912 (curr-fracspace 0) ; current fractional space amount |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
913 count) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
914 (end-of-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
915 ;; Check if this is the last line of the paragraph. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
916 (if (and use-hard-newlines (null eop) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
917 (get-text-property (point) 'hard)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
918 (setq eop t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
919 (skip-chars-backward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
920 ;; Quick exit if it appears to be properly justified already |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
921 ;; or there is no text. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
922 (if (or (bolp) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
923 (and (memq how '(full right)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
924 (= (current-column) fc))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
925 nil |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
926 (setq end (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
927 (beginning-of-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
928 (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
929 ;; Skip over fill-prefix. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
930 (if (and fill-prefix |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
931 (not (string-equal fill-prefix "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
932 (equal fill-prefix |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
933 (buffer-substring |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
934 (point) (min (point-max) (+ (length fill-prefix) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
935 (point)))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
936 (forward-char (length fill-prefix)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
937 (if (and adaptive-fill-mode |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
938 (looking-at adaptive-fill-regexp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
939 (goto-char (match-end 0)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
940 (setq fp-end (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
941 (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
942 ;; This is beginning of the line's text. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
943 (setq indent (current-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
944 (setq beg (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
945 (goto-char end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
946 (setq endcol (current-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
947 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
948 ;; HOW can't be null or left--we would have exited already |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
949 (cond ((eq 'right how) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
950 (setq ncols (- fc endcol)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
951 (if (< ncols 0) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
952 ;; Need to remove some indentation |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
953 (delete-region |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
954 (progn (goto-char fp-end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
955 (if (< (current-column) (+ indent ncols)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
956 (move-to-column (+ indent ncols) t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
957 (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
958 (progn (move-to-column indent) (point))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
959 ;; Need to add some |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
960 (goto-char beg) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
961 (indent-to (+ indent ncols)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
962 ;; If point was at beginning of text, keep it there. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
963 (if (= beg pos) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
964 (move-marker pos (point))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
965 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
966 ((eq 'center how) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
967 ;; Figure out how much indentation is needed |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
968 (setq ncols (+ (current-left-margin) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
969 (/ (- fc (current-left-margin) ;avail. space |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
970 (- endcol indent)) ;text width |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
971 2))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
972 (if (< ncols indent) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
973 ;; Have too much indentation - remove some |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
974 (delete-region |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
975 (progn (goto-char fp-end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
976 (if (< (current-column) ncols) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
977 (move-to-column ncols t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
978 (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
979 (progn (move-to-column indent) (point))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
980 ;; Have too little - add some |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
981 (goto-char beg) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
982 (indent-to ncols) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
983 ;; If point was at beginning of text, keep it there. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
984 (if (= beg pos) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
985 (move-marker pos (point))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
986 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
987 ((eq 'full how) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
988 ;; Insert extra spaces between words to justify line |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
989 (save-restriction |
10543
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
990 (narrow-to-region beg end) |
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
991 (or nosqueeze |
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
992 (canonically-space-region beg end)) |
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
993 (goto-char (point-max)) |
21727
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
994 ;; count word spaces in line |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
995 (while (search-backward " " nil t) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
996 (setq nspaces (1+ nspaces)) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
997 (skip-chars-backward " ")) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
998 (setq ncols (- fc endcol)) |
21727
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
999 ;; Ncols is number of additional space chars needed |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1000 (if (and (> ncols 0) (> nspaces 0) (not eop)) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1001 (progn |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1002 (setq curr-fracspace (+ ncols (/ (1+ nspaces) 2)) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1003 count nspaces) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1004 (while (> count 0) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1005 (skip-chars-forward " ") |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1006 (insert-and-inherit |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1007 (make-string (/ curr-fracspace nspaces) ?\ )) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1008 (search-forward " " nil t) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1009 (setq count (1- count) |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1010 curr-fracspace |
88afa87063ff
(justify-current-line): Use new algorithm to apportion the spaces to be added.
Richard M. Stallman <rms@gnu.org>
parents:
21150
diff
changeset
|
1011 (+ (% curr-fracspace nspaces) ncols))))))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1012 (t (error "Unknown justification value")))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1013 (goto-char pos) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1014 (move-marker pos nil))) |
2109
73485780a8f9
* simple.el (yank, yank-pop): Always return nil; don't rely on
Jim Blandy <jimb@redhat.com>
parents:
1332
diff
changeset
|
1015 nil) |
9026
74fd93bc3568
(justify-current-line): Inherit props when inserting spaces.
Richard M. Stallman <rms@gnu.org>
parents:
8363
diff
changeset
|
1016 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1017 (defun unjustify-current-line () |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1018 "Remove justification whitespace from current line. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1019 If the line is centered or right-justified, this function removes any |
13981
6758b889a7c1
(fill-context-prefix, unjustify-current-line,
Karl Heuer <kwzh@gnu.org>
parents:
13839
diff
changeset
|
1020 indentation past the left margin. If the line is full-justified, it removes |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1021 extra spaces between words. It does nothing in other justification modes." |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1022 (let ((justify (current-justification))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1023 (cond ((eq 'left justify) nil) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1024 ((eq nil justify) nil) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1025 ((eq 'full justify) ; full justify: remove extra spaces |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1026 (beginning-of-line-text) |
32230 | 1027 (canonically-space-region (point) (line-end-position))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1028 ((memq justify '(center right)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1029 (save-excursion |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1030 (move-to-left-margin nil t) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1031 ;; Position ourselves after any fill-prefix. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1032 (if (and fill-prefix |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1033 (not (string-equal fill-prefix "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1034 (equal fill-prefix |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1035 (buffer-substring |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1036 (point) (min (point-max) (+ (length fill-prefix) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1037 (point)))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1038 (forward-char (length fill-prefix))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1039 (delete-region (point) (progn (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1040 (point)))))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1041 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1042 (defun unjustify-region (&optional begin end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1043 "Remove justification whitespace from region. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1044 For centered or right-justified regions, this function removes any indentation |
13981
6758b889a7c1
(fill-context-prefix, unjustify-current-line,
Karl Heuer <kwzh@gnu.org>
parents:
13839
diff
changeset
|
1045 past the left margin from each line. For full-justified lines, it removes |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1046 extra spaces between words. It does nothing in other justification modes. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1047 Arguments BEGIN and END are optional; default is the whole buffer." |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1048 (save-excursion |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1049 (save-restriction |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1050 (if end (narrow-to-region (point-min) end)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1051 (goto-char (or begin (point-min))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1052 (while (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1053 (unjustify-current-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1054 (forward-line 1))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1055 |
75 | 1056 |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1057 (defun fill-nonuniform-paragraphs (min max &optional justifyp citation-regexp) |
2520
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1058 "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
|
1059 This command divides the region into \"paragraphs\", |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1060 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
|
1061 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
|
1062 in the paragraph. |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1063 |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1064 When calling from a program, pass range to fill as first two arguments. |
638 | 1065 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1066 Optional third and fourth arguments JUSTIFY and MAIL-FLAG: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1067 JUSTIFY to justify paragraphs (prefix arg), |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1068 When filling a mail message, pass a regexp for CITATION-REGEXP |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1069 which will match the prefix of a line which is a citation marker |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1070 plus whitespace, but no other kind of prefix. |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1071 Also, if CITATION-REGEXP is non-nil, don't fill header lines." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1072 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1073 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1074 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1075 (if current-prefix-arg 'full)))) |
2520
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1076 (let ((fill-individual-varying-indent t)) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1077 (fill-individual-paragraphs min max justifyp citation-regexp))) |
2520
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1078 |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1079 (defun fill-individual-paragraphs (min max &optional justify citation-regexp) |
2520
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1080 "Fill paragraphs of uniform indentation within the region. |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1081 This command divides the region into \"paragraphs\", |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1082 treating every change in indentation level or prefix as a paragraph boundary, |
2520
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1083 then fills each paragraph using its indentation level as the fill prefix. |
638 | 1084 |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1085 There is one special case where a change in indentation does not start |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1086 a new paragraph. This is for text of this form: |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1087 |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1088 foo> This line with extra indentation starts |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1089 foo> a paragraph that continues on more lines. |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1090 |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1091 These lines are filled together. |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1092 |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1093 When calling from a program, pass the range to fill |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1094 as the first two arguments. |
638 | 1095 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1096 Optional third and fourth arguments JUSTIFY and MAIL-FLAG: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1097 JUSTIFY to justify paragraphs (prefix arg), |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1098 When filling a mail message, pass a regexp for CITATION-REGEXP |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1099 which will match the prefix of a line which is a citation marker |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1100 plus whitespace, but no other kind of prefix. |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1101 Also, if CITATION-REGEXP is non-nil, don't fill header lines." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1102 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1103 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1104 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1105 (if current-prefix-arg 'full)))) |
474 | 1106 (save-restriction |
1107 (save-excursion | |
1108 (goto-char min) | |
1109 (beginning-of-line) | |
9706
f5f7d07eece8
(fill-individual-paragraphs): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents:
9217
diff
changeset
|
1110 (narrow-to-region (point) max) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1111 (if citation-regexp |
9706
f5f7d07eece8
(fill-individual-paragraphs): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents:
9217
diff
changeset
|
1112 (while (and (not (eobp)) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
1113 (or (looking-at "[ \t]*[^ \t\n]+:") |
9706
f5f7d07eece8
(fill-individual-paragraphs): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents:
9217
diff
changeset
|
1114 (looking-at "[ \t]*$"))) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
1115 (if (looking-at "[ \t]*[^ \t\n]+:") |
4992
8a3293abe1ba
(fill-individual-paragraphs): Fix skipping headers of yanked message.
Richard M. Stallman <rms@gnu.org>
parents:
4413
diff
changeset
|
1116 (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
|
1117 (forward-line 1)))) |
474 | 1118 (narrow-to-region (point) max) |
1119 ;; Loop over paragraphs. | |
20263
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1120 (while (let ((here (point))) |
19810
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1121 ;; Skip over all paragraph-separating lines |
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1122 ;; so as to not include them in any paragraph. |
20263
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1123 (while (and (not (eobp)) |
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1124 (progn (move-to-left-margin) |
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1125 (and (not (eobp)) |
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1126 (looking-at paragraph-separate)))) |
19810
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1127 (forward-line 1)) |
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1128 (skip-chars-forward " \t\n") (not (eobp))) |
13502
57a0a9e5399e
(fill-region-as-paragraph): Since adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
13473
diff
changeset
|
1129 (move-to-left-margin) |
474 | 1130 (let ((start (point)) |
1131 fill-prefix fill-prefix-regexp) | |
1132 ;; Find end of paragraph, and compute the smallest fill-prefix | |
1133 ;; that fits all the lines in this paragraph. | |
1134 (while (progn | |
1135 ;; Update the fill-prefix on the first line | |
1136 ;; and whenever the prefix good so far is too long. | |
1137 (if (not (and fill-prefix | |
1138 (looking-at fill-prefix-regexp))) | |
1139 (setq fill-prefix | |
32230 | 1140 (fill-individual-paragraphs-prefix |
1141 citation-regexp) | |
13502
57a0a9e5399e
(fill-region-as-paragraph): Since adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
13473
diff
changeset
|
1142 fill-prefix-regexp (regexp-quote fill-prefix))) |
13548
9be6c740e36f
(fill-individual-paragraphs): Advance 1 line in inner loop.
Richard M. Stallman <rms@gnu.org>
parents:
13502
diff
changeset
|
1143 (forward-line 1) |
15308
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1144 (if (bolp) |
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1145 ;; If forward-line went past a newline, |
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1146 ;; move further to the left margin. |
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1147 (move-to-left-margin)) |
474 | 1148 ;; Now stop the loop if end of paragraph. |
1149 (and (not (eobp)) | |
638 | 1150 (if fill-individual-varying-indent |
1151 ;; If this line is a separator line, with or | |
1152 ;; without prefix, end the paragraph. | |
1153 (and | |
13548
9be6c740e36f
(fill-individual-paragraphs): Advance 1 line in inner loop.
Richard M. Stallman <rms@gnu.org>
parents:
13502
diff
changeset
|
1154 (not (looking-at paragraph-separate)) |
9be6c740e36f
(fill-individual-paragraphs): Advance 1 line in inner loop.
Richard M. Stallman <rms@gnu.org>
parents:
13502
diff
changeset
|
1155 (save-excursion |
9be6c740e36f
(fill-individual-paragraphs): Advance 1 line in inner loop.
Richard M. Stallman <rms@gnu.org>
parents:
13502
diff
changeset
|
1156 (not (and (looking-at fill-prefix-regexp) |
32230 | 1157 (progn (forward-char |
1158 (length fill-prefix)) | |
1159 (looking-at | |
1160 paragraph-separate)))))) | |
638 | 1161 ;; If this line has more or less indent |
1162 ;; than the fill prefix wants, end the paragraph. | |
1163 (and (looking-at fill-prefix-regexp) | |
25127
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1164 ;; If fill prefix is shorter than a new |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1165 ;; fill prefix computed here, end paragraph. |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1166 (let ((this-line-fill-prefix |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1167 (fill-individual-paragraphs-prefix |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1168 citation-regexp))) |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1169 (>= (length fill-prefix) |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1170 (length this-line-fill-prefix))) |
638 | 1171 (save-excursion |
32230 | 1172 (not (progn (forward-char |
1173 (length fill-prefix)) | |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1174 (or (looking-at "[ \t]") |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1175 (looking-at paragraph-separate) |
28489
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1176 (looking-at paragraph-start))))) |
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1177 (not (and (equal fill-prefix "") |
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1178 citation-regexp |
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1179 (looking-at citation-regexp)))))))) |
474 | 1180 ;; Fill this paragraph, but don't add a newline at the end. |
1181 (let ((had-newline (bolp))) | |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1182 (fill-region-as-paragraph start (point) justify) |
23184
973ac8db2f92
(fill-individual-paragraphs): Before deleting
Karl Heuer <kwzh@gnu.org>
parents:
22748
diff
changeset
|
1183 (if (and (bolp) (not had-newline)) |
973ac8db2f92
(fill-individual-paragraphs): Before deleting
Karl Heuer <kwzh@gnu.org>
parents:
22748
diff
changeset
|
1184 (delete-char -1)))))))) |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
638
diff
changeset
|
1185 |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1186 (defun fill-individual-paragraphs-prefix (citation-regexp) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1187 (or (let ((adaptive-fill-first-line-regexp "") |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1188 just-one-line-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1189 two-lines-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1190 one-line-citation-part |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1191 two-lines-citation-part |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1192 adjusted-two-lines-citation-part) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1193 (setq just-one-line-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1194 (fill-context-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1195 (point) |
32230 | 1196 (line-beginning-position 2))) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1197 (setq two-lines-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1198 (fill-context-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1199 (point) |
32230 | 1200 (line-beginning-position 2))) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1201 (when just-one-line-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1202 (setq one-line-citation-part |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1203 (if citation-regexp |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1204 (fill-individual-paragraphs-citation just-one-line-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1205 citation-regexp) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1206 just-one-line-prefix))) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1207 (when two-lines-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1208 (setq two-lines-citation-part |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1209 (if citation-regexp |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1210 (fill-individual-paragraphs-citation two-lines-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1211 citation-regexp) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1212 just-one-line-prefix)) |
23351
a8979439d44b
(fill-individual-paragraphs-prefix):
Karl Heuer <kwzh@gnu.org>
parents:
23184
diff
changeset
|
1213 (or two-lines-citation-part (setq two-lines-citation-part "")) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1214 (setq adjusted-two-lines-citation-part |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1215 (substring two-lines-citation-part 0 |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1216 (string-match "[ \t]*\\'" |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1217 two-lines-citation-part)))) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1218 ;; See if the citation part of JUST-ONE-LINE-PREFIX |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1219 ;; is the same as that of TWO-LINES-PREFIX, |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1220 ;; except perhaps with longer whitespace. |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1221 (if (and just-one-line-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1222 two-lines-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1223 (string-match (concat "\\`" |
32230 | 1224 (regexp-quote |
1225 adjusted-two-lines-citation-part) | |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1226 "[ \t]*\\'") |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1227 one-line-citation-part) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1228 (>= (string-width one-line-citation-part) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1229 (string-width two-lines-citation-part))) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1230 two-lines-prefix |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1231 just-one-line-prefix)) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1232 (buffer-substring |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1233 (point) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1234 (save-excursion (skip-chars-forward " \t") |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1235 (point))))) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1236 |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1237 (defun fill-individual-paragraphs-citation (string citation-regexp) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1238 (string-match citation-regexp |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1239 string) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1240 (match-string 0 string)) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1241 |
732 | 1242 ;;; fill.el ends here |