Mercurial > emacs
annotate lisp/textmodes/fill.el @ 89909:68c22ea6027c
Sync to HEAD
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 16 Apr 2004 12:51:06 +0000 |
parents | 375f2633d815 |
children | 4c90ffeb71c5 |
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 |
89909 | 3 ;; Copyright (C) 1985,86,92,94,95,96,97,1999,2001,02,03,2004 |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
821
diff
changeset
|
5 |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
38186
diff
changeset
|
6 ;; Maintainer: FSF |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
7 ;; Keywords: wp |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
8 |
75 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; 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
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
75 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
75 | 25 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
26 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
27 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
28 ;; 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
|
29 ;; manual. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2109
diff
changeset
|
30 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
31 ;;; Code: |
75 | 32 |
89909 | 33 (defgroup fill nil |
34 "Indenting and filling text." | |
35 :link '(custom-manual "(emacs)Filling") | |
36 :group 'editing) | |
37 | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
38 (defcustom fill-individual-varying-indent nil |
638 | 39 "*Controls criterion for a new paragraph in `fill-individual-paragraphs'. |
40 Non-nil means changing indent doesn't end a paragraph. | |
41 That mode can handle paragraphs with extra indentation on the first line, | |
42 but it requires separator lines between paragraphs. | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
43 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
|
44 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
45 :group 'fill) |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
46 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
47 (defcustom colon-double-space nil |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
48 "*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
|
49 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
50 :group 'fill) |
12752
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
51 |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
52 (defvar fill-paragraph-function nil |
13839
d597ac78b00e
(fill-paragraph-function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13713
diff
changeset
|
53 "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
|
54 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
|
55 |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
56 (defvar fill-paragraph-handle-comment t |
89909 | 57 "Non-nil means paragraph filling will try to pay attention to comments.") |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
58 |
89909 | 59 (defcustom enable-kinsoku t |
60 "*Non-nil means enable \"kinsoku\" processing on filling paragraphs. | |
19239
8298b8a6a47d
(enable-kinsoku): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19220
diff
changeset
|
61 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
|
62 placed at the beginning or end of a line by filling. |
89909 | 63 See the documentation of `kinsoku' for more information." |
64 :type 'boolean) | |
16998 | 65 |
75 | 66 (defun set-fill-prefix () |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
67 "Set the fill prefix to the current line up to point. |
218 | 68 Filling expects lines to start with the fill prefix and |
69 reinserts the fill prefix in each resulting line." | |
75 | 70 (interactive) |
35785
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
71 (let ((left-margin-pos (save-excursion (move-to-left-margin) (point)))) |
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
72 (if (> (point) left-margin-pos) |
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
73 (progn |
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
74 (setq fill-prefix (buffer-substring left-margin-pos (point))) |
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
75 (if (equal fill-prefix "") |
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
76 (setq fill-prefix nil))) |
e8b7be229b24
(set-fill-prefix): Cancel fill prefix if point
Gerd Moellmann <gerd@gnu.org>
parents:
33441
diff
changeset
|
77 (setq fill-prefix nil))) |
75 | 78 (if fill-prefix |
79 (message "fill-prefix: \"%s\"" fill-prefix) | |
80 (message "fill-prefix cancelled"))) | |
81 | |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
82 (defcustom adaptive-fill-mode t |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
83 "*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
|
84 :type 'boolean |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
85 :group 'fill) |
218 | 86 |
32230 | 87 (defcustom adaptive-fill-regexp |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
88 ;; Added `!' for doxygen comments starting with `//!' or `/*!'. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
89 ;; Added `%' for TeX comments. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
90 (purecopy "[ \t]*\\([-!|#%;>*]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*") |
218 | 91 "*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
|
92 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
|
93 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
|
94 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
|
95 |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
96 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
|
97 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
|
98 a role." |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
99 :type 'regexp |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
100 :group 'fill) |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
101 |
19076
457a082715c8
(adaptive-fill-first-line-regexp): Fix regexp.
Richard M. Stallman <rms@gnu.org>
parents:
19010
diff
changeset
|
102 (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
|
103 "*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
|
104 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
|
105 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
|
106 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
|
107 |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
108 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
|
109 |
5ab53c383b5c
(fill-context-prefix): If we get a prefix from the
Richard M. Stallman <rms@gnu.org>
parents:
17852
diff
changeset
|
110 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
|
111 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
|
112 :type 'regexp |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
113 :group 'fill) |
218 | 114 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
115 (defcustom adaptive-fill-function nil |
35963
4681ff6664e6
(adaptive-fill-function): Fix :type
Dave Love <fx@gnu.org>
parents:
35785
diff
changeset
|
116 "*Function to call to choose a fill prefix for a paragraph, or nil. |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
117 This function is used when `adaptive-fill-regexp' does not match." |
35963
4681ff6664e6
(adaptive-fill-function): Fix :type
Dave Love <fx@gnu.org>
parents:
35785
diff
changeset
|
118 :type '(choice (const nil) function) |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
119 :group 'fill) |
12752
86c8fb2284de
(fill-region-as-paragraph): Don't find adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
12557
diff
changeset
|
120 |
41517
f0a204c61f81
(fill-indent-according-to-mode): Default to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41303
diff
changeset
|
121 (defvar fill-indent-according-to-mode nil ;Screws up CC-mode's filling tricks. |
33365
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
122 "Whether or not filling should try to use the major mode's indentation.") |
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
123 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
124 (defun current-fill-column () |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
125 "Return the fill-column to use for this line. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
126 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
|
127 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
|
128 subtracted from `fill-column'. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
129 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
130 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
|
131 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
|
132 (save-excursion |
12429
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
133 (if fill-column |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
134 (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
|
135 (here-col 0) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
136 (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
|
137 margin fill-col change col) |
32230 | 138 ;; Look separately at each region of line with a different |
139 ;; right-margin. | |
12429
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
140 (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
|
141 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
|
142 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
|
143 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
|
144 (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
|
145 (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
|
146 (< col fill-col))) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
147 (setq here change |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
148 here-col col)) |
d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
11448
diff
changeset
|
149 (max here-col fill-col))))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
150 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
151 (defun canonically-space-region (beg end) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
152 "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
|
153 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
|
154 \(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
|
155 and `sentence-end-without-period'). |
12557
34e9427fe8f5
(canonically-space-region): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
12429
diff
changeset
|
156 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
|
157 (interactive "*r") |
44504
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
158 (let ((end-spc-re (concat "\\(" sentence-end "\\) *\\| +"))) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
159 (save-excursion |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
160 (goto-char beg) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
161 ;; Nuke tabs; they get screwed up in a fill. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
162 ;; This is quick, but loses when a tab follows the end of a sentence. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
163 ;; Actually, it is difficult to tell that from "Mr.\tSmith". |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
164 ;; Blame the typist. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
165 (subst-char-in-region beg end ?\t ?\ ) |
25606
7ab723e4a21a
(fill-region-as-paragraph, canonically-space-region):
Richard M. Stallman <rms@gnu.org>
parents:
25127
diff
changeset
|
166 (while (and (< (point) end) |
44504
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
167 (re-search-forward end-spc-re end t)) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
168 (delete-region |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
169 (cond |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
170 ;; `sentence-end' matched and did not match all spaces. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
171 ;; I.e. it only matched the number of spaces it needs: drop the rest. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
172 ((and (match-end 1) (> (match-end 0) (match-end 1))) (match-end 1)) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
173 ;; `sentence-end' matched but with nothing left. Either that means |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
174 ;; nothing should be removed, or it means it's the "old-style" |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
175 ;; sentence-end which matches all it can. Keep only 2 spaces. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
176 ;; We probably don't even need to check `sentence-end-double-space'. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
177 ((match-end 1) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
178 (min (match-end 0) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
179 (+ (if sentence-end-double-space 2 1) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
180 (save-excursion (goto-char (match-end 0)) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
181 (skip-chars-backward " ") |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
182 (point))))) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
183 (t ;; It's not an end of sentence. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
184 (+ (match-beginning 0) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
185 ;; Determine number of spaces to leave: |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
186 (save-excursion |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
187 (skip-chars-backward " ]})\"'") |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
188 (cond ((and sentence-end-double-space |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
189 (or (memq (preceding-char) '(?. ?? ?!)) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
190 (and sentence-end-without-period |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
191 (= (char-syntax (preceding-char)) ?w)))) 2) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
192 ((and colon-double-space |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
193 (= (preceding-char) ?:)) 2) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
194 ((char-equal (preceding-char) ?\n) 0) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
195 (t 1)))))) |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
196 (match-end 0)))))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
197 |
27287
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
198 (defun fill-common-string-prefix (s1 s2) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
199 "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
|
200 (let ((cmp (compare-strings s1 nil nil s2 nil nil))) |
33365
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
201 (if (eq cmp t) |
27287
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
202 s1 |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
203 (setq cmp (1- (abs cmp))) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
204 (unless (zerop cmp) |
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
205 (substring s1 0 cmp))))) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
206 |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
207 (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
|
208 "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
|
209 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
|
210 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
|
211 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
|
212 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
|
213 (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
|
214 (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
|
215 (save-excursion |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
216 (goto-char from) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
217 (if (eolp) (forward-line 1)) |
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
218 ;; Move to the second line unless there is just one. |
40668
56aa9e5dc60c
(fill-context-prefix): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40633
diff
changeset
|
219 (move-to-left-margin) |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
220 (let ((firstline (point)) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
221 first-line-prefix |
13586
292e11b5f9c6
(fill-context-prefix): New arg first-line-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
13578
diff
changeset
|
222 ;; Non-nil if we are on the second line. |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
223 second-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
224 start) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
225 (setq start (point)) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
226 (setq first-line-prefix |
36610
0598c5e629d2
(fill-context-prefix): Allow first-line-prefix to match paragraph-start.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36302
diff
changeset
|
227 ;; We don't need to consider `paragraph-start' here since it |
0598c5e629d2
(fill-context-prefix): Allow first-line-prefix to match paragraph-start.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36302
diff
changeset
|
228 ;; will be explicitly checked later on. |
0598c5e629d2
(fill-context-prefix): Allow first-line-prefix to match paragraph-start.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36302
diff
changeset
|
229 ;; Also setting first-line-prefix to nil prevents |
0598c5e629d2
(fill-context-prefix): Allow first-line-prefix to match paragraph-start.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36302
diff
changeset
|
230 ;; second-line-prefix from being used. |
0598c5e629d2
(fill-context-prefix): Allow first-line-prefix to match paragraph-start.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36302
diff
changeset
|
231 (cond ;; ((looking-at paragraph-start) nil) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
232 ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp)) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
233 (match-string-no-properties 0)) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
234 (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
|
235 (forward-line 1) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
236 (if (< (point) to) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
237 (progn |
44955
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
238 (move-to-left-margin) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
239 (setq start (point)) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
240 (setq second-line-prefix |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
241 (cond ((looking-at paragraph-start) nil) ;Can it happen ? -stef |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
242 ((and adaptive-fill-regexp |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
243 (looking-at adaptive-fill-regexp)) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
244 (buffer-substring-no-properties start (match-end 0))) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
245 (adaptive-fill-function |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
246 (funcall adaptive-fill-function)))) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
247 ;; 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
|
248 ;; make sure it or something compatible is on the first line too. |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
249 (when second-line-prefix |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
250 (unless first-line-prefix (setq first-line-prefix "")) |
44955
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
251 ;; If the non-whitespace chars match the first line, |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
252 ;; just use it (this subsumes the 2 checks used previously). |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
253 ;; Used when first line is `/* ...' and second-line is |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
254 ;; ` * ...'. |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
255 (let ((tmp second-line-prefix) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
256 (re "\\`")) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
257 (while (string-match "\\`[ \t]*\\([^ \t]+\\)" tmp) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
258 (setq re (concat re ".*" (regexp-quote (match-string 1 tmp)))) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
259 (setq tmp (substring tmp (match-end 0)))) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
260 ;; (assert (string-match "\\`[ \t]*\\'" tmp)) |
27287
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
261 |
44955
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
262 (if (string-match re first-line-prefix) |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
263 second-line-prefix |
27287
523c67808ff4
(fill-common-string-prefix): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
26898
diff
changeset
|
264 |
44955
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
265 ;; Use the longest common substring of both prefixes, |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
266 ;; if there is one. |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
267 (fill-common-string-prefix first-line-prefix |
09c66758d36e
(fill-context-prefix): Fix last change with yet-another-approach.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44508
diff
changeset
|
268 second-line-prefix))))) |
18282
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
269 ;; 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
|
270 ;; maybe change it to whitespace, |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
271 ;; 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
|
272 (if first-line-prefix |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
273 (let ((result |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
274 ;; 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
|
275 ;; 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
|
276 ;; 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
|
277 (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
|
278 (string-match first-line-regexp |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
279 first-line-prefix)) |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
280 (and comment-start-skip |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
281 (string-match comment-start-skip |
363bd42657e1
(fill-context-prefix): Fix criteria for first line,
Richard M. Stallman <rms@gnu.org>
parents:
18229
diff
changeset
|
282 first-line-prefix))) |
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 (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
|
285 ;; 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
|
286 ;; 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
|
287 (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
|
288 (concat result "a")))) |
18283 | 289 result))))))) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
290 |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
291 (defun fill-single-word-nobreak-p () |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
292 "Don't break a line after the first or before the last word of a sentence." |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
293 (or (looking-at "[ \t]*\\sw+[ \t]*[.?!:][ \t]*$") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
294 (save-excursion |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
295 (skip-chars-backward " \t") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
296 (and (/= (skip-syntax-backward "w") 0) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
297 (/= (skip-chars-backward " \t") 0) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
298 (/= (skip-chars-backward ".?!:") 0))))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
299 |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
300 (defun fill-french-nobreak-p () |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
301 "Return nil if French style allows breaking the line at point. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
302 This is used in `fill-nobreak-predicate' to prevent breaking lines just |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
303 after an opening paren or just before a closing paren or a punctuation |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
304 mark such as `?' or `:'. It is common in French writing to put a space |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
305 at such places, which would normally allow breaking the line at those |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
306 places." |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
307 (or (looking-at "[ \t]*[])}»?!;:-]") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
308 (save-excursion |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
309 (skip-chars-backward " \t") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
310 (unless (bolp) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
311 (backward-char 1) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
312 (or (looking-at "[([{«]") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
313 ;; Don't cut right after a single-letter word. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
314 (and (memq (preceding-char) '(?\t ?\ )) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
315 (eq (char-syntax (following-char)) ?w))))))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
316 |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
317 (defcustom fill-nobreak-predicate nil |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
318 "List of predicates for recognizing places not to break a line. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
319 The predicates are called with no arguments, with point at the place to |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
320 be tested. If it returns t, fill commands do not break the line there." |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
321 :group 'fill |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
322 :type 'hook |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
323 :options '(fill-french-nobreak-p fill-single-word-nobreak-p)) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
324 |
48286
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
325 (defcustom fill-nobreak-invisible nil |
89909 | 326 "Non-nil means that fill commands do not break lines in invisible text." |
48286
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
327 :type 'boolean |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
328 :group 'fill) |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
329 |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
330 (defun fill-nobreak-p () |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
331 "Return nil if breaking the line at point is allowed. |
48286
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
332 Can be customized with the variables `fill-nobreak-predicate' |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
333 and `fill-nobreak-invisible'." |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
334 (or |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
335 (and fill-nobreak-invisible (line-move-invisible (point))) |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
336 (unless (bolp) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
337 (or |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
338 ;; Don't break after a period followed by just one space. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
339 ;; Move back to the previous place to break. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
340 ;; The reason is that if a period ends up at the end of a |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
341 ;; line, further fills will assume it ends a sentence. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
342 ;; If we now know it does not end a sentence, avoid putting |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
343 ;; it at the end of the line. |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
344 (and sentence-end-double-space |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
345 (save-excursion |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
346 (skip-chars-backward ". ") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
347 (looking-at "\\. \\([^ ]\\|$\\)"))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
348 ;; Another approach to the same problem. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
349 (save-excursion |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
350 (skip-chars-backward ". ") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
351 (and (looking-at "\\.") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
352 (not (looking-at sentence-end)))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
353 ;; Don't split a line if the rest would look like a new paragraph. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
354 (unless use-hard-newlines |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
355 (save-excursion |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
356 (skip-chars-forward " \t") (looking-at paragraph-start))) |
48286
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
357 (run-hook-with-args-until-success 'fill-nobreak-predicate))))) |
21123
e1c817a29b2d
(fill-nobreak-predicate): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21103
diff
changeset
|
358 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
359 ;; 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
|
360 ;; require special functions to find line breaking point. |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
361 (dolist (pair '((katakana-jisx0201 . kinsoku) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
362 (chinese-gb2312 . kinsoku) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
363 (japanese-jisx0208 . kinsoku) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
364 (japanese-jisx0212 . kinsoku) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
365 (chinese-big5-1 . kinsoku) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
366 (chinese-big5-2 . kinsoku))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
367 (put-charset-property (car pair) 'fill-find-break-point-function (cdr pair))) |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
368 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
369 (defun fill-find-break-point (limit) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
370 "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
|
371 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
|
372 |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
373 This function is called when we are going to break the current line |
89909 | 374 after or before a non-ASCII character. If the charset of the |
23519
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
375 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
|
376 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
|
377 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
|
378 (let* ((ch (following-char)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
379 (charset (char-charset ch)) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
380 func) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
381 (if (eq charset 'ascii) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
382 (setq ch (preceding-char) |
78085d485d73
(sentence-end-without-period): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23490
diff
changeset
|
383 charset (char-charset ch))) |
29484
59d0015683a5
(fill-find-break-point): Check the validity of charset.
Kenichi Handa <handa@m17n.org>
parents:
28489
diff
changeset
|
384 (if (charsetp charset) |
59d0015683a5
(fill-find-break-point): Check the validity of charset.
Kenichi Handa <handa@m17n.org>
parents:
28489
diff
changeset
|
385 (setq func |
59d0015683a5
(fill-find-break-point): Check the validity of charset.
Kenichi Handa <handa@m17n.org>
parents:
28489
diff
changeset
|
386 (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
|
387 (if (and func (fboundp func)) |
182d67795a5b
(fill-find-break-point): Delete codes for
Kenichi Handa <handa@m17n.org>
parents:
25606
diff
changeset
|
388 (funcall func limit)))) |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
389 |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
390 (defun fill-delete-prefix (from to prefix) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
391 "Delete the fill prefix from every line except the first. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
392 The first line may not even have a fill prefix. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
393 Point is moved to just past the fill prefix on the first line." |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
394 (let ((fpre (if (and prefix (not (string-match "\\`[ \t]*\\'" prefix))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
395 (concat "[ \t]*\\(" |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
396 (replace-regexp-in-string |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
397 "[ \t]+" "[ \t]*" |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
398 (regexp-quote prefix)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
399 "\\)?[ \t]*") |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
400 "[ \t]*"))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
401 (goto-char from) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
402 (if (>= (+ (current-left-margin) (length prefix)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
403 (current-fill-column)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
404 (error "fill-prefix too long for specified width")) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
405 (forward-line 1) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
406 (while (< (point) to) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
407 (if (looking-at fpre) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
408 (delete-region (point) (match-end 0))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
409 (forward-line 1)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
410 (goto-char from) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
411 (if (looking-at fpre) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
412 (goto-char (match-end 0))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
413 (setq from (point)))) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
414 |
50757
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
415 ;; The `fill-space' property carries the string with which a newline |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
416 ;; should be replaced when unbreaking a line (in fill-delete-newlines). |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
417 ;; It is added to newline characters by fill-newline when the default |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
418 ;; behavior of fill-delete-newlines is not what we want. |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
419 (add-to-list 'text-property-default-nonsticky '(fill-space . t)) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
420 |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
421 (defun fill-delete-newlines (from to justify nosqueeze squeeze-after) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
422 (goto-char from) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
423 ;; Make sure sentences ending at end of line get an extra space. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
424 ;; loses on split abbrevs ("Mr.\nSmith") |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
425 (let ((eol-double-space-re |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
426 (cond |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
427 ((not colon-double-space) (concat sentence-end "$")) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
428 ;; Try to add the : inside the `sentence-end' regexp. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
429 ((string-match "\\[[^][]*\\(\\.\\)[^][]*\\]" sentence-end) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
430 (concat (replace-match ".:" nil nil sentence-end 1) "$")) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
431 ;; Can't find the right spot to insert the colon. |
89909 | 432 (t "[.?!:][])}\"']*$"))) |
433 (sentence-end-without-space-list | |
434 (string-to-list sentence-end-without-space))) | |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
435 (while (re-search-forward eol-double-space-re to t) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
436 (or (>= (point) to) (memq (char-before) '(?\t ?\ )) |
89909 | 437 (memq (char-after (match-beginning 0)) |
438 sentence-end-without-space-list) | |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
439 (insert-and-inherit ?\ )))) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
440 |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
441 (goto-char from) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
442 (if enable-multibyte-characters |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
443 ;; Delete unnecessay newlines surrounded by words. The |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
444 ;; character category `|' means that we can break a line |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
445 ;; at the character. And, charset property |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
446 ;; `nospace-between-words' tells how to concatenate |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
447 ;; words. If the value is non-nil, never put spaces |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
448 ;; between words, thus delete a newline between them. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
449 ;; If the value is nil, delete a newline only when a |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
450 ;; character preceding a newline has text property |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
451 ;; `nospace-between-words'. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
452 (while (search-forward "\n" to t) |
50757
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
453 (if (get-text-property (match-beginning 0) 'fill-space) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
454 (replace-match (get-text-property (match-beginning 0) 'fill-space)) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
455 (let ((prev (char-before (match-beginning 0))) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
456 (next (following-char))) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
457 (if (and (or (aref (char-category-set next) ?|) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
458 (aref (char-category-set prev) ?|)) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
459 (or (get-charset-property (char-charset prev) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
460 'nospace-between-words) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
461 (get-text-property (1- (match-beginning 0)) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
462 'nospace-between-words))) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
463 (delete-char -1)))))) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
464 |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
465 (goto-char from) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
466 (skip-chars-forward " \t") |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
467 ;; Then change all newlines to spaces. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
468 (subst-char-in-region from to ?\n ?\ ) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
469 (if (and nosqueeze (not (eq justify 'full))) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
470 nil |
50437
1a4038cf9a79
(fill-delete-newlines): Remove trailing whitespace.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50411
diff
changeset
|
471 (canonically-space-region (or squeeze-after (point)) to) |
1a4038cf9a79
(fill-delete-newlines): Remove trailing whitespace.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50411
diff
changeset
|
472 ;; Remove trailing whitespace. |
1a4038cf9a79
(fill-delete-newlines): Remove trailing whitespace.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50411
diff
changeset
|
473 ;; Maybe canonically-space-region should do that. |
50443
dff98b69fed2
(fill-delete-newlines): Don't delete past TO.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50438
diff
changeset
|
474 (goto-char to) (delete-char (- (skip-chars-backward " \t")))) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
475 (goto-char from)) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
476 |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
477 (defun fill-move-to-break-point (linebeg) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
478 "Move to the position where the line should be broken. |
44504
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
479 The break position will be always after LINEBEG and generally before point." |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
480 ;; If the fill column is before linebeg, move to linebeg. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
481 (if (> linebeg (point)) (goto-char linebeg)) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
482 ;; Move back to the point where we can break the line |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
483 ;; at. We break the line between word or after/before |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
484 ;; the character which has character category `|'. We |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
485 ;; search space, \c| followed by a character, or \c| |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
486 ;; following a character. If not found, place |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
487 ;; the point at linebeg. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
488 (while |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
489 (when (re-search-backward "[ \t]\\|\\c|.\\|.\\c|" linebeg 0) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
490 ;; In case of space, we place the point at next to |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
491 ;; the point where the break occurs actually, |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
492 ;; because we don't want to change the following |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
493 ;; logic of original Emacs. In case of \c|, the |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
494 ;; point is at the place where the break occurs. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
495 (forward-char 1) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
496 (when (fill-nobreak-p) (skip-chars-backward " \t" linebeg)))) |
48095
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
497 |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
498 ;; Move back over the single space between the words. |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
499 (skip-chars-backward " \t") |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
500 |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
501 ;; If the left margin and fill prefix by themselves |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
502 ;; pass the fill-column. or if they are zero |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
503 ;; but we have no room for even one word, |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
504 ;; keep at least one word or a character which has |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
505 ;; category `|' anyway. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
506 (if (>= linebeg (point)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
507 ;; Ok, skip at least one word or one \c| character. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
508 ;; Meanwhile, don't stop at a period followed by one space. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
509 (let ((to (line-end-position)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
510 (fill-nobreak-predicate nil) ;to break sooner. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
511 (first t)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
512 (goto-char linebeg) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
513 (while (and (< (point) to) (or first (fill-nobreak-p))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
514 ;; Find a breakable point while ignoring the |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
515 ;; following spaces. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
516 (skip-chars-forward " \t") |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
517 (if (looking-at "\\c|") |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
518 (forward-char 1) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
519 (let ((pos (save-excursion |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
520 (skip-chars-forward "^ \n\t") |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
521 (point)))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
522 (if (re-search-forward "\\c|" pos t) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
523 (forward-char -1) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
524 (goto-char pos)))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
525 (setq first nil))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
526 |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
527 (if enable-multibyte-characters |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
528 ;; If we are going to break the line after or |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
529 ;; before a non-ascii character, we may have to |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
530 ;; run a special function for the charset of the |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
531 ;; character to find the correct break point. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
532 (if (not (and (eq (charset-after (1- (point))) 'ascii) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
533 (eq (charset-after (point)) 'ascii))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
534 ;; Make sure we take SOMETHING after the fill prefix if any. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
535 (fill-find-break-point linebeg))))) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
536 |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
537 (defun fill-newline () |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
538 ;; Replace whitespace here with one newline, then |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
539 ;; indent to left margin. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
540 (skip-chars-backward " \t") |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
541 (insert ?\n) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
542 ;; Give newline the properties of the space(s) it replaces |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
543 (set-text-properties (1- (point)) (point) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
544 (text-properties-at (point))) |
50757
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
545 (and (looking-at "\\( [ \t]*\\)\\(\\c|\\)?") |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
546 (or (aref (char-category-set (or (char-before (1- (point))) ?\000)) ?|) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
547 (match-end 2)) |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
548 ;; When refilling later on, this newline would normally not be replaced |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
549 ;; by a space, so we need to mark it specially to re-install the space |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
550 ;; when we unfill. |
89533dc3e837
(text-property-default-nonsticky): Add fill-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50659
diff
changeset
|
551 (put-text-property (1- (point)) (point) 'fill-space (match-string 1))) |
48286
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
552 ;; If we don't want breaks in invisible text, don't insert |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
553 ;; an invisible newline. |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
554 (if fill-nobreak-invisible |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
555 (remove-text-properties (1- (point)) (point) |
a820dd4741e1
(fill-nobreak-invisible): New var.
Kim F. Storm <storm@cua.dk>
parents:
48208
diff
changeset
|
556 '(invisible t))) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
557 (if (or fill-prefix |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
558 (not fill-indent-according-to-mode)) |
48621
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
559 (fill-indent-to-left-margin) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
560 (indent-according-to-mode)) |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
561 ;; Insert the fill prefix after indentation. |
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
562 (and fill-prefix (not (equal fill-prefix "")) |
50411
62a57aa6353a
(fill-newline): Don't leave markers before the prefix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50409
diff
changeset
|
563 ;; Markers that were after the whitespace are now at point: insert |
62a57aa6353a
(fill-newline): Don't leave markers before the prefix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50409
diff
changeset
|
564 ;; before them so they don't get stuck before the prefix. |
62a57aa6353a
(fill-newline): Don't leave markers before the prefix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50409
diff
changeset
|
565 (insert-before-markers-and-inherit fill-prefix))) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
566 |
48621
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
567 (defun fill-indent-to-left-margin () |
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
568 "Indent current line to the column given by `current-left-margin'." |
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
569 (let ((beg (point))) |
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
570 (indent-line-to (current-left-margin)) |
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
571 (put-text-property beg (point) 'face 'default))) |
2cf7301b2f52
(fill-indent-to-left-margin): New function.
Richard M. Stallman <rms@gnu.org>
parents:
48286
diff
changeset
|
572 |
14621
f989cff391f1
(canonically-space-region): Use insert-before-markers
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
573 (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
|
574 nosqueeze squeeze-after) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
575 "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
|
576 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
|
577 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
|
578 `current-left-margin' and `current-fill-column' functions. |
18664 | 579 \(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
|
580 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
|
581 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
582 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
|
583 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
|
584 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
585 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
|
586 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
|
587 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
|
588 means don't canonicalize spaces before that position. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
589 |
48095
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
590 Return the `fill-prefix' used for filling. |
33441
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
591 |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
592 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
|
593 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
|
594 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
595 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
596 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
597 (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
|
598 (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
|
599 (setq justify 'full)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
600 |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
601 ;; Make sure "to" is the endpoint. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
602 (goto-char (min from to)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
603 (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
|
604 ;; 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
|
605 (skip-chars-forward " \t\n") |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
606 |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
607 (let ((from-plus-indent (point)) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
608 (oneleft nil)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
609 |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
610 (beginning-of-line) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
611 (setq from (point)) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
612 |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
613 ;; 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
|
614 ;; 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
|
615 (goto-char to) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
616 (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
|
617 (if (and oneleft |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
618 (not (and use-hard-newlines |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
619 (get-text-property (1- (point)) 'hard)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
620 (delete-backward-char 1) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
621 (backward-char 1) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
622 (setq oneleft t))) |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
623 (setq to (copy-marker (point) t)) |
33365
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
624 ;; ;; If there was no newline, and there is text in the paragraph, then |
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
625 ;; ;; create a newline. |
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
626 ;; (if (and (not oneleft) (> to from-plus-indent)) |
2c0585b6e6d6
(fill-indent-according-to-mode): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32230
diff
changeset
|
627 ;; (newline)) |
13578
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
628 (goto-char from-plus-indent)) |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
629 |
85697e02a482
(fill-region-as-paragraph): Remove redundant "setq from".
Richard M. Stallman <rms@gnu.org>
parents:
13549
diff
changeset
|
630 (if (not (> to (point))) |
44491
d85112eaf2d2
(adaptive-fill-regexp): Add ! and %.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44478
diff
changeset
|
631 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
|
632 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
633 (or justify (setq justify (current-justification))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
634 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
635 ;; 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
|
636 (let ((fill-prefix fill-prefix)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
637 ;; Figure out how this paragraph is indented, if desired. |
41303
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
638 (when (and adaptive-fill-mode |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
639 (or (null fill-prefix) (string= fill-prefix ""))) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
640 (setq fill-prefix (fill-context-prefix from to)) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
641 ;; Ignore a white-space only fill-prefix |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
642 ;; if we indent-according-to-mode. |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
643 (when (and fill-prefix fill-indent-according-to-mode |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
644 (string-match "\\`[ \t]*\\'" fill-prefix)) |
ada5571dc737
(fill-delete-prefix, fill-delete-newlines):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40668
diff
changeset
|
645 (setq fill-prefix nil))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
646 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
647 (goto-char from) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
648 (beginning-of-line) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
649 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
650 (if (not justify) ; filling disabled: just check indentation |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
651 (progn |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
652 (goto-char from) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
653 (while (< (point) to) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
654 (if (and (not (eolp)) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
655 (< (current-indentation) (current-left-margin))) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
656 (fill-indent-to-left-margin)) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
657 (forward-line 1))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
658 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
659 (if use-hard-newlines |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
660 (remove-list-of-text-properties from to '(hard))) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
661 ;; Make sure first line is indented (at least) to left margin... |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
662 (if (or (memq justify '(right center)) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
663 (< (current-indentation) (current-left-margin))) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
664 (fill-indent-to-left-margin)) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
665 ;; Delete the fill-prefix from every line. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
666 (fill-delete-prefix from to fill-prefix) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
667 (setq from (point)) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
668 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
669 ;; FROM, and point, are now before the text to fill, |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
670 ;; but after any fill prefix on the first line. |
218 | 671 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
672 (fill-delete-newlines from to justify nosqueeze squeeze-after) |
218 | 673 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
674 ;; This is the actual filling loop. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
675 (goto-char from) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
676 (let (linebeg) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
677 (while (< (point) to) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
678 (setq linebeg (point)) |
50659
f20dbbe44da9
(fill-region-as-paragraph): Fix "last line goes to fill-column+1" problem.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50443
diff
changeset
|
679 (move-to-column (current-fill-column)) |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
680 (if (when (< (point) to) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
681 ;; Find the position where we'll break the line. |
50659
f20dbbe44da9
(fill-region-as-paragraph): Fix "last line goes to fill-column+1" problem.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50443
diff
changeset
|
682 (forward-char 1) ;Use an immediately following space, if any. |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
683 (fill-move-to-break-point linebeg) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
684 ;; Check again to see if we got to the end of |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
685 ;; the paragraph. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
686 (skip-chars-forward " \t") |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
687 (< (point) to)) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
688 ;; Found a place to cut. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
689 (progn |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
690 (fill-newline) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
691 (when justify |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
692 ;; Justify the line just ended, if desired. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
693 (save-excursion |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
694 (forward-line -1) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
695 (justify-current-line justify nil t)))) |
23490
dc320f6914fe
Setup `fill-find-break-point-function'
Kenichi Handa <handa@m17n.org>
parents:
23351
diff
changeset
|
696 |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
697 (goto-char to) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
698 ;; Justify this last line, if desired. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
699 (if justify (justify-current-line justify t t)))))) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
700 ;; Leave point after final newline. |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
701 (goto-char to) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
702 (unless (eobp) (forward-char 1)) |
33441
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
703 ;; Return the fill-prefix we used |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
704 fill-prefix))) |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
705 |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
706 (defsubst skip-line-prefix (prefix) |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
707 "If point is inside the string PREFIX at the beginning of line, move past it." |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
708 (when (and prefix |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
709 (< (- (point) (line-beginning-position)) (length prefix)) |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
710 (save-excursion |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
711 (beginning-of-line) |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
712 (looking-at (regexp-quote prefix)))) |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
713 (goto-char (match-end 0)))) |
75 | 714 |
715 (defun fill-paragraph (arg) | |
36302
a2f48aef1741
(fill-region-as-paragraph): Skip spaces backward
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35963
diff
changeset
|
716 "Fill paragraph at or after point. Prefix ARG means justify as well. |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
717 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
|
718 space does not end a sentence, so don't break a line there. |
18664 | 719 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
|
720 |
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
721 If `fill-paragraph-function' is non-nil, we call it (passing our |
33441
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
722 argument to it), and if it returns non-nil, we simply return its value. |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
723 |
36302
a2f48aef1741
(fill-region-as-paragraph): Skip spaces backward
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35963
diff
changeset
|
724 If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." |
24972
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
725 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
726 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
727 (list (if current-prefix-arg 'full)))) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
728 ;; First try fill-paragraph-function. |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
729 (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
|
730 (let ((function fill-paragraph-function) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
731 ;; If fill-paragraph-function is set, it probably takes care |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
732 ;; of comments and stuff. If not, it will have to set |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
733 ;; fill-paragraph-handle-comment back to t explicitly or |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
734 ;; return nil. |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
735 (fill-paragraph-handle-comment nil) |
10636
6f9d0e697678
(fill-paragraph): Bind fill-paragraph-function to nil before calling it.
Richard M. Stallman <rms@gnu.org>
parents:
10631
diff
changeset
|
736 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
|
737 (funcall function arg))) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
738 ;; Then try our syntax-aware filling code. |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
739 (and fill-paragraph-handle-comment |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
740 ;; Our code only handles \n-terminated comments right now. |
89909 | 741 comment-start (equal comment-end "") |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
742 (let ((fill-paragraph-handle-comment nil)) |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
743 (fill-comment-paragraph arg))) |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
744 ;; If it all fails, default to the good ol' text paragraph filling. |
22367 | 745 (let ((before (point)) |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
746 (paragraph-start paragraph-start) |
44504
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
747 ;; Fill prefix used for filling the paragraph. |
483f757c5f72
(canonically-space-region): Obey sentence-end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44491
diff
changeset
|
748 fill-pfx) |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
749 ;; Try to prevent code sections and comment sections from being |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
750 ;; filled together. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
751 (when (and fill-paragraph-handle-comment comment-start-skip) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
752 (setq paragraph-start |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
753 (concat paragraph-start "\\|[ \t]*\\(?:" |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
754 comment-start-skip "\\)"))) |
10631
dc245bfecc3b
(fill-paragraph-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10543
diff
changeset
|
755 (save-excursion |
47779
d53b71650f3b
(fill-paragraph): Go to BOL before calling forward-paragraph to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47751
diff
changeset
|
756 ;; To make sure the return value of forward-paragraph is meaningful, |
d53b71650f3b
(fill-paragraph): Go to BOL before calling forward-paragraph to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47751
diff
changeset
|
757 ;; we have to start from the beginning of line, otherwise skipping |
d53b71650f3b
(fill-paragraph): Go to BOL before calling forward-paragraph to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47751
diff
changeset
|
758 ;; past the last few chars of a paragraph-separator would count as |
d53b71650f3b
(fill-paragraph): Go to BOL before calling forward-paragraph to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47751
diff
changeset
|
759 ;; a paragraph (and not skipping any chars at EOB would not count |
d53b71650f3b
(fill-paragraph): Go to BOL before calling forward-paragraph to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47751
diff
changeset
|
760 ;; as a paragraph even if it is). |
d53b71650f3b
(fill-paragraph): Go to BOL before calling forward-paragraph to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47751
diff
changeset
|
761 (move-to-left-margin) |
47751
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
762 (if (not (zerop (forward-paragraph))) |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
763 ;; There's no paragraph at or after point: give up. |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
764 (setq fill-pfx "") |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
765 (let ((end (point)) |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
766 (beg (progn (backward-paragraph) (point)))) |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
767 (goto-char before) |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
768 (setq fill-pfx |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
769 (if use-hard-newlines |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
770 ;; Can't use fill-region-as-paragraph, since this |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
771 ;; paragraph may still contain hard newlines. See |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
772 ;; fill-region. |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
773 (fill-region beg end arg) |
cd005e017b51
(fill-paragraph): Give up if there's no paragraph at or after point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47269
diff
changeset
|
774 (fill-region-as-paragraph beg end arg)))))) |
33441
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
775 fill-pfx))) |
75 | 776 |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
777 (defun fill-comment-paragraph (&optional justify) |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
778 "Fill current comment. |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
779 If we're not in a comment, just return nil so that the caller |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
780 can take care of filling. JUSTIFY is used as in `fill-paragraph'." |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
781 (comment-normalize-vars) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
782 (let (has-code-and-comment ; Non-nil if it contains code and a comment. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
783 comin comstart) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
784 ;; Figure out what kind of comment we are looking at. |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
785 (save-excursion |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
786 (beginning-of-line) |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
787 (when (setq comstart (comment-search-forward (line-end-position) t)) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
788 (setq comin (point)) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
789 (goto-char comstart) (skip-chars-backward " \t") |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
790 (setq has-code-and-comment (not (bolp))))) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
791 |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
792 (if (not comstart) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
793 ;; Return nil, so the normal filling will take place. |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
794 nil |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
795 |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
796 ;; Narrow to include only the comment, and then fill the region. |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
797 (let* ((fill-prefix fill-prefix) |
52023
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
798 (commark |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
799 (comment-string-strip (buffer-substring comstart comin) nil t)) |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
800 (comment-re |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
801 (if (string-match comment-start-skip (concat commark "a")) |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
802 (concat "[ \t]*" (regexp-quote commark) |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
803 ;; Make sure we only match comments that use |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
804 ;; the exact same comment marker. |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
805 "[^" (substring commark -1) "]") |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
806 ;; If the commark needs to be followed by some special |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
807 ;; set of characters (like @c in TeXinfo), we can't |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
808 ;; rely just on `commark'. |
ba56926bf332
(fill-comment-paragraph): Construct a regexp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50757
diff
changeset
|
809 (concat "[ \t]*\\(?:" comment-start-skip "\\)"))) |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
810 (comment-fill-prefix ; Compute a fill prefix. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
811 (save-excursion |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
812 (goto-char comstart) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
813 (if has-code-and-comment |
89909 | 814 (concat |
815 (if (not indent-tabs-mode) | |
816 (make-string (current-column) ?\ ) | |
817 (concat | |
818 (make-string (/ (current-column) tab-width) ?\t) | |
819 (make-string (% (current-column) tab-width) ?\ ))) | |
820 (buffer-substring (point) comin)) | |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
821 (buffer-substring (line-beginning-position) comin)))) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
822 beg end) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
823 (save-excursion |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
824 (save-restriction |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
825 (beginning-of-line) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
826 (narrow-to-region |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
827 ;; Find the first line we should include in the region to fill. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
828 (if has-code-and-comment |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
829 (line-beginning-position) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
830 (save-excursion |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
831 (while (and (zerop (forward-line -1)) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
832 (looking-at comment-re))) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
833 ;; We may have gone too far. Go forward again. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
834 (line-beginning-position |
89909 | 835 (if (progn |
836 (goto-char | |
837 (or (comment-search-forward (line-end-position) t) | |
838 (point))) | |
839 (looking-at comment-re)) | |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
840 1 2)))) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
841 ;; Find the beginning of the first line past the region to fill. |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
842 (save-excursion |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
843 (while (progn (forward-line 1) |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
844 (looking-at comment-re))) |
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
845 (point))) |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
846 ;; Obey paragraph starters and boundaries within comments. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
847 (let* ((paragraph-separate |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
848 ;; Use the default values since they correspond to |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
849 ;; the values to use for plain text. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
850 (concat paragraph-separate "\\|[ \t]*\\(?:" |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
851 comment-start-skip "\\)\\(?:" |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
852 (default-value 'paragraph-separate) "\\)")) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
853 (paragraph-start |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
854 (concat paragraph-start "\\|[ \t]*\\(?:" |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
855 comment-start-skip "\\)\\(?:" |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
856 (default-value 'paragraph-start) "\\)")) |
89909 | 857 ;; We used to reply on fill-prefix to break paragraph at |
858 ;; comment-starter changes, but it did not work for the | |
859 ;; first line (mixed comment&code). | |
860 ;; We now use comment-re instead to "manually" make sure | |
861 ;; we treat comment-marker changes as paragraph boundaries. | |
862 ;; (paragraph-ignore-fill-prefix nil) | |
863 ;; (fill-prefix comment-fill-prefix) | |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
864 (after-line (if has-code-and-comment |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
865 (line-beginning-position 2)))) |
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
866 (setq end (progn (forward-paragraph) (point))) |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
867 ;; If this comment starts on a line with code, |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
868 ;; include that line in the filling. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
869 (setq beg (progn (backward-paragraph) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
870 (if (eq (point) after-line) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
871 (forward-line -1)) |
50408
329ac267f1fc
(fill-region-as-paragraph): Remove obsolete `save-restriction'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
872 (point))))) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
873 |
48208
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
874 ;; Find the fill-prefix to use. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
875 (cond |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
876 (fill-prefix) ; Use the user-provided fill prefix. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
877 ((and adaptive-fill-mode ; Try adaptive fill mode. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
878 (setq fill-prefix (fill-context-prefix beg end)) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
879 (string-match comment-start-skip fill-prefix))) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
880 (t |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
881 (setq fill-prefix comment-fill-prefix))) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
882 |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
883 ;; Don't fill with narrowing. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
884 (or |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
885 (fill-region-as-paragraph |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
886 beg end justify nil |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
887 ;; Don't canonicalize spaces within the code just before |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
888 ;; the comment. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
889 (save-excursion |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
890 (goto-char beg) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
891 (if (looking-at fill-prefix) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
892 nil |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
893 (re-search-forward comment-start-skip)))) |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
894 ;; Make sure we don't return nil. |
0cdc12c2cf68
(fill-paragraph): Consider a comment-start as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48126
diff
changeset
|
895 t)))))) |
48126
92c696f8509e
(fill-paragraph-handle-comment): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48095
diff
changeset
|
896 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
897 (defun fill-region (from to &optional justify nosqueeze to-eop) |
75 | 898 "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
|
899 A prefix arg means justify as well. |
18664 | 900 Ordinarily the variable `fill-column' controls the width. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
901 |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
902 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
|
903 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
|
904 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
|
905 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
|
906 |
21103
8e12f5209e37
(fill-region): If JUSTIFY is non-nil
Richard M. Stallman <rms@gnu.org>
parents:
20822
diff
changeset
|
907 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
|
908 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
|
909 non-nil means to keep filling to the end of the paragraph (or next |
89909 | 910 hard newline, if variable `use-hard-newlines' is on). |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
911 |
33441
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
912 Return the fill-prefix used for filling the last paragraph. |
b938b9d018a3
(skip-line-prefix): New function.
Miles Bader <miles@gnu.org>
parents:
33365
diff
changeset
|
913 |
5770
92dd602768d2
(sentence-end-double-space): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
5291
diff
changeset
|
914 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
|
915 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
|
916 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
917 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
918 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
919 (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
|
920 (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
|
921 (setq justify 'full)) |
48095
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
922 (let (max beg fill-pfx) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
923 (goto-char (max from to)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
924 (when to-eop |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
925 (skip-chars-backward "\n") |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
926 (forward-paragraph)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
927 (setq max (copy-marker (point) t)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
928 (goto-char (setq beg (min from to))) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
929 (beginning-of-line) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
930 (while (< (point) max) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
931 (let ((initial (point)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
932 end) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
933 ;; If using hard newlines, break at every one for filling |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
934 ;; purposes rather than using paragraph breaks. |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
935 (if use-hard-newlines |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
936 (progn |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
937 (while (and (setq end (text-property-any (point) max |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
938 'hard t)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
939 (not (= ?\n (char-after end))) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
940 (not (>= end max))) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
941 (goto-char (1+ end))) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
942 (setq end (if end (min max (1+ end)) max)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
943 (goto-char initial)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
944 (forward-paragraph 1) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
945 (setq end (min max (point))) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
946 (forward-paragraph -1)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
947 (if (< (point) beg) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
948 (goto-char beg)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
949 (if (>= (point) initial) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
950 (setq fill-pfx |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
951 (fill-region-as-paragraph (point) end justify nosqueeze)) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
952 (goto-char end)))) |
cce15dd3ec16
(fill-move-to-break-point): Skip white space
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47779
diff
changeset
|
953 fill-pfx)) |
75 | 954 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
955 |
17664
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
956 (defcustom default-justification 'left |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
957 "*Method of justifying text not otherwise specified. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
958 Possible values are `left', `right', `full', `center', or `none'. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
959 The requested kind of justification is done whenever lines are filled. |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
960 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
|
961 :type '(choice (const left) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
962 (const right) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
963 (const full) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
964 (const center) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
965 (const none)) |
d8cb277f0ce8
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16998
diff
changeset
|
966 :group 'fill) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
967 (make-variable-buffer-local 'default-justification) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
968 |
10472
82ff279a4cea
(current-justification): Renamed from current-justification. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
10468
diff
changeset
|
969 (defun current-justification () |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
970 "How should we justify this line? |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
971 This returns the value of the text-property `justification', |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
972 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
|
973 However, it returns nil rather than `none' to mean \"don't justify\"." |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
974 (let ((j (or (get-text-property |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
975 ;; Make sure we're looking at paragraph body. |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
976 (save-excursion (skip-chars-forward " \t") |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
977 (if (and (eobp) (not (bobp))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
978 (1- (point)) (point))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
979 'justification) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
980 default-justification))) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
981 (if (eq 'none j) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
982 nil |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
983 j))) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
984 |
41849
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
985 (defun set-justification (begin end style &optional whole-par) |
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
986 "Set the region's justification style to STYLE. |
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
987 This commands prompts for the kind of justification to use. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
988 If the mark is not active, this command operates on the current paragraph. |
41849
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
989 If the mark is active, it operates on the region. However, if the |
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
990 beginning and end of the region are not at paragraph breaks, they are |
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
991 moved to the beginning and end \(respectively) of the paragraphs they |
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
992 are in. |
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
993 |
89909 | 994 If variable `use-hard-newlines' is true, all hard newlines are |
995 taken to be paragraph breaks. | |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
996 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
997 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
|
998 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
|
999 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
|
1000 (interactive (list (if mark-active (region-beginning) (point)) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1001 (if mark-active (region-end) (point)) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1002 (let ((s (completing-read |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1003 "Set justification to: " |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1004 '(("left") ("right") ("full") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1005 ("center") ("none")) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1006 nil t))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1007 (if (equal s "") (error "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1008 (intern s)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1009 t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1010 (save-excursion |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1011 (save-restriction |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1012 (if whole-par |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1013 (let ((paragraph-start (if use-hard-newlines "." paragraph-start)) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1014 (paragraph-ignore-fill-prefix (if use-hard-newlines t |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1015 paragraph-ignore-fill-prefix))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1016 (goto-char begin) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1017 (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
|
1018 (backward-paragraph) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1019 (setq begin (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1020 (goto-char end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1021 (skip-chars-backward " \t\n" begin) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1022 (forward-paragraph) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1023 (setq end (point)))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1024 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1025 (narrow-to-region (point-min) end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1026 (unjustify-region begin (point-max)) |
41849
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
1027 (put-text-property begin (point-max) 'justification style) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1028 (fill-region begin (point-max) nil t)))) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1029 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1030 (defun set-justification-none (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1031 "Disable automatic filling for paragraphs in the region. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1032 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
|
1033 (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
|
1034 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1035 (set-justification b e 'none t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1036 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1037 (defun set-justification-left (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1038 "Make paragraphs in the region left-justified. |
41849
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
1039 This means they are flush at the left margin and ragged on the right. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1040 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
|
1041 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
|
1042 (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
|
1043 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1044 (set-justification b e 'left t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1045 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1046 (defun set-justification-right (b e) |
41800 | 1047 "Make paragraphs in the region right-justified. |
41849
82810216f9a4
(set-justification): Rename arg VALUE to STYLE.
Richard M. Stallman <rms@gnu.org>
parents:
41800
diff
changeset
|
1048 This means they are flush at the right margin and ragged on the left. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1049 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
|
1050 (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
|
1051 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1052 (set-justification b e 'right t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1053 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1054 (defun set-justification-full (b e) |
41800 | 1055 "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
|
1056 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
|
1057 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
|
1058 (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
|
1059 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1060 (set-justification b e 'full t)) |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1061 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1062 (defun set-justification-center (b e) |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1063 "Make paragraphs in the region centered. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1064 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
|
1065 (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
|
1066 (if mark-active (region-end) (point)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1067 (set-justification b e 'center t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1068 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1069 ;; A line has up to six parts: |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1070 ;; |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1071 ;; >>> hello. |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1072 ;; [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
|
1073 ;; |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1074 ;; "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
|
1075 ;; given by the `current-left-margin' function. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1076 ;; "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
|
1077 ;; "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
|
1078 ;; `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
|
1079 ;; 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
|
1080 ;; 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
|
1081 ;; center- or right-justifying. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1082 ;; |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1083 ;; All parts of the line are optional, although the final newline can |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1084 ;; 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
|
1085 |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1086 (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
|
1087 "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
|
1088 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
|
1089 the column given by `current-fill-column'. |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1090 Optional first argument HOW specifies alternate type of justification: |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1091 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
|
1092 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
|
1093 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
|
1094 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
|
1095 it will not be stretched by full justification. |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1096 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
|
1097 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
|
1098 (interactive "*") |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
1099 (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
|
1100 (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
|
1101 (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
|
1102 (setq how 'full)))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1103 (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
|
1104 (let ((fc (current-fill-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1105 (pos (point-marker)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1106 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
|
1107 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
|
1108 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
|
1109 indent ; column of `beg' |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1110 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
|
1111 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
|
1112 (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
|
1113 ; 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
|
1114 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
|
1115 ; 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
|
1116 (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
|
1117 count) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1118 (end-of-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1119 ;; Check if this is the last line of the paragraph. |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1120 (if (and use-hard-newlines (null eop) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1121 (get-text-property (point) 'hard)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1122 (setq eop t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1123 (skip-chars-backward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1124 ;; 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
|
1125 ;; or there is no text. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1126 (if (or (bolp) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1127 (and (memq how '(full right)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1128 (= (current-column) fc))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1129 nil |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1130 (setq end (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1131 (beginning-of-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1132 (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1133 ;; Skip over fill-prefix. |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1134 (if (and fill-prefix |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1135 (not (string-equal fill-prefix "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1136 (equal fill-prefix |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1137 (buffer-substring |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1138 (point) (min (point-max) (+ (length fill-prefix) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1139 (point)))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1140 (forward-char (length fill-prefix)) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1141 (if (and adaptive-fill-mode |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1142 (looking-at adaptive-fill-regexp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1143 (goto-char (match-end 0)))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1144 (setq fp-end (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1145 (skip-chars-forward " \t") |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1146 ;; 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
|
1147 (setq indent (current-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1148 (setq beg (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1149 (goto-char end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1150 (setq endcol (current-column)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1151 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1152 ;; HOW can't be null or left--we would have exited already |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1153 (cond ((eq 'right how) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1154 (setq ncols (- fc endcol)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1155 (if (< ncols 0) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1156 ;; Need to remove some indentation |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1157 (delete-region |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1158 (progn (goto-char fp-end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1159 (if (< (current-column) (+ indent ncols)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1160 (move-to-column (+ indent ncols) t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1161 (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1162 (progn (move-to-column indent) (point))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1163 ;; Need to add some |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1164 (goto-char beg) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1165 (indent-to (+ indent ncols)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1166 ;; If point was at beginning of text, keep it there. |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1167 (if (= beg pos) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1168 (move-marker pos (point))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1169 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1170 ((eq 'center how) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1171 ;; Figure out how much indentation is needed |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1172 (setq ncols (+ (current-left-margin) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1173 (/ (- fc (current-left-margin) ;avail. space |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1174 (- endcol indent)) ;text width |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1175 2))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1176 (if (< ncols indent) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1177 ;; Have too much indentation - remove some |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1178 (delete-region |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1179 (progn (goto-char fp-end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1180 (if (< (current-column) ncols) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1181 (move-to-column ncols t)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1182 (point)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1183 (progn (move-to-column indent) (point))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1184 ;; Have too little - add some |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1185 (goto-char beg) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1186 (indent-to ncols) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1187 ;; 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
|
1188 (if (= beg pos) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1189 (move-marker pos (point))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1190 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1191 ((eq 'full how) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1192 ;; 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
|
1193 (save-restriction |
10543
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
1194 (narrow-to-region beg end) |
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
1195 (or nosqueeze |
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
1196 (canonically-space-region beg end)) |
3b896847b849
(justify-current-line): Avoid error comparing fill-prefix
Richard M. Stallman <rms@gnu.org>
parents:
10497
diff
changeset
|
1197 (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
|
1198 ;; 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
|
1199 (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
|
1200 (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
|
1201 (skip-chars-backward " ")) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1202 (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
|
1203 ;; 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
|
1204 (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
|
1205 (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
|
1206 (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
|
1207 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
|
1208 (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
|
1209 (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
|
1210 (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
|
1211 (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
|
1212 (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
|
1213 (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
|
1214 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
|
1215 (+ (% curr-fracspace nspaces) ncols))))))) |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1216 (t (error "Unknown justification value")))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1217 (goto-char pos) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1218 (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
|
1219 nil) |
9026
74fd93bc3568
(justify-current-line): Inherit props when inserting spaces.
Richard M. Stallman <rms@gnu.org>
parents:
8363
diff
changeset
|
1220 |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1221 (defun unjustify-current-line () |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1222 "Remove justification whitespace from current line. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1223 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
|
1224 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
|
1225 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
|
1226 (let ((justify (current-justification))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1227 (cond ((eq 'left justify) nil) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1228 ((eq nil justify) nil) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1229 ((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
|
1230 (beginning-of-line-text) |
32230 | 1231 (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
|
1232 ((memq justify '(center right)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1233 (save-excursion |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1234 (move-to-left-margin nil t) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1235 ;; Position ourselves after any fill-prefix. |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1236 (if (and fill-prefix |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1237 (not (string-equal fill-prefix "")) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1238 (equal fill-prefix |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1239 (buffer-substring |
10811
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1240 (point) (min (point-max) (+ (length fill-prefix) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1241 (point)))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1242 (forward-char (length fill-prefix))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1243 (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
|
1244 (point)))))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1245 |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1246 (defun unjustify-region (&optional begin end) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1247 "Remove justification whitespace from region. |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1248 For centered or right-justified regions, this function removes any indentation |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1249 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
|
1250 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
|
1251 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
|
1252 (save-excursion |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1253 (save-restriction |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1254 (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
|
1255 (goto-char (or begin (point-min))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1256 (while (not (eobp)) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1257 (unjustify-current-line) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1258 (forward-line 1))))) |
7f9e55cdc349
(set-fill-prefix): start from left-margin.
Boris Goldowsky <boris@gnu.org>
parents:
10636
diff
changeset
|
1259 |
75 | 1260 |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1261 (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
|
1262 "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
|
1263 This command divides the region into \"paragraphs\", |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1264 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
|
1265 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
|
1266 in the paragraph. |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1267 |
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1268 When calling from a program, pass range to fill as first two arguments. |
638 | 1269 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1270 Optional third and fourth arguments JUSTIFY and MAIL-FLAG: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1271 JUSTIFY to justify paragraphs (prefix arg), |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1272 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
|
1273 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
|
1274 plus whitespace, but no other kind of prefix. |
47269
dd5bcff29f6a
(fill-nonuniform-paragraphs, fill-individual-paragraphs): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
44955
diff
changeset
|
1275 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
|
1276 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1277 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1278 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1279 (if current-prefix-arg 'full)))) |
2520
ef643dbb7d40
(fill-nonuniform-paragraphs): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2412
diff
changeset
|
1280 (let ((fill-individual-varying-indent t)) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1281 (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
|
1282 |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1283 (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
|
1284 "Fill paragraphs of uniform indentation within the region. |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1285 This command divides the region into \"paragraphs\", |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1286 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
|
1287 then fills each paragraph using its indentation level as the fill prefix. |
638 | 1288 |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1289 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
|
1290 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
|
1291 |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1292 foo> This line with extra indentation starts |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1293 foo> a paragraph that continues on more lines. |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1294 |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1295 These lines are filled together. |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1296 |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1297 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
|
1298 as the first two arguments. |
638 | 1299 |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1300 Optional third and fourth arguments JUSTIFY and MAIL-FLAG: |
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1301 JUSTIFY to justify paragraphs (prefix arg), |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1302 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
|
1303 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
|
1304 plus whitespace, but no other kind of prefix. |
47269
dd5bcff29f6a
(fill-nonuniform-paragraphs, fill-individual-paragraphs): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
44955
diff
changeset
|
1305 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
|
1306 (interactive (progn |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1307 (barf-if-buffer-read-only) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1308 (list (region-beginning) (region-end) |
ff8ffbbc63e8
(canonically-space-region, justify-current-line): Add * to interactive
Dave Love <fx@gnu.org>
parents:
24473
diff
changeset
|
1309 (if current-prefix-arg 'full)))) |
474 | 1310 (save-restriction |
1311 (save-excursion | |
1312 (goto-char min) | |
1313 (beginning-of-line) | |
9706
f5f7d07eece8
(fill-individual-paragraphs): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents:
9217
diff
changeset
|
1314 (narrow-to-region (point) max) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1315 (if citation-regexp |
9706
f5f7d07eece8
(fill-individual-paragraphs): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents:
9217
diff
changeset
|
1316 (while (and (not (eobp)) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
1317 (or (looking-at "[ \t]*[^ \t\n]+:") |
9706
f5f7d07eece8
(fill-individual-paragraphs): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents:
9217
diff
changeset
|
1318 (looking-at "[ \t]*$"))) |
13473
4492ba9a0757
(fill-region-as-paragraph): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13172
diff
changeset
|
1319 (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
|
1320 (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
|
1321 (forward-line 1)))) |
474 | 1322 (narrow-to-region (point) max) |
1323 ;; Loop over paragraphs. | |
20263
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1324 (while (let ((here (point))) |
19810
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1325 ;; Skip over all paragraph-separating lines |
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1326 ;; 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
|
1327 (while (and (not (eobp)) |
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1328 (progn (move-to-left-margin) |
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1329 (and (not (eobp)) |
7808c4885103
(fill-individual-paragraphs): Don't get
Karl Heuer <kwzh@gnu.org>
parents:
20234
diff
changeset
|
1330 (looking-at paragraph-separate)))) |
19810
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1331 (forward-line 1)) |
495951c8a761
(fill-individual-paragraphs): Don't include
Richard M. Stallman <rms@gnu.org>
parents:
19419
diff
changeset
|
1332 (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
|
1333 (move-to-left-margin) |
474 | 1334 (let ((start (point)) |
1335 fill-prefix fill-prefix-regexp) | |
1336 ;; Find end of paragraph, and compute the smallest fill-prefix | |
1337 ;; that fits all the lines in this paragraph. | |
1338 (while (progn | |
1339 ;; Update the fill-prefix on the first line | |
1340 ;; and whenever the prefix good so far is too long. | |
1341 (if (not (and fill-prefix | |
1342 (looking-at fill-prefix-regexp))) | |
1343 (setq fill-prefix | |
32230 | 1344 (fill-individual-paragraphs-prefix |
1345 citation-regexp) | |
13502
57a0a9e5399e
(fill-region-as-paragraph): Since adaptive-fill-regexp
Richard M. Stallman <rms@gnu.org>
parents:
13473
diff
changeset
|
1346 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
|
1347 (forward-line 1) |
15308
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1348 (if (bolp) |
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1349 ;; 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
|
1350 ;; move further to the left margin. |
9a31b0d0c38a
(fill-individual-paragraphs): Don't get stuck
Richard M. Stallman <rms@gnu.org>
parents:
14840
diff
changeset
|
1351 (move-to-left-margin)) |
474 | 1352 ;; Now stop the loop if end of paragraph. |
1353 (and (not (eobp)) | |
638 | 1354 (if fill-individual-varying-indent |
1355 ;; If this line is a separator line, with or | |
1356 ;; without prefix, end the paragraph. | |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1357 (and |
13548
9be6c740e36f
(fill-individual-paragraphs): Advance 1 line in inner loop.
Richard M. Stallman <rms@gnu.org>
parents:
13502
diff
changeset
|
1358 (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
|
1359 (save-excursion |
9be6c740e36f
(fill-individual-paragraphs): Advance 1 line in inner loop.
Richard M. Stallman <rms@gnu.org>
parents:
13502
diff
changeset
|
1360 (not (and (looking-at fill-prefix-regexp) |
32230 | 1361 (progn (forward-char |
1362 (length fill-prefix)) | |
1363 (looking-at | |
1364 paragraph-separate)))))) | |
638 | 1365 ;; If this line has more or less indent |
1366 ;; than the fill prefix wants, end the paragraph. | |
1367 (and (looking-at fill-prefix-regexp) | |
25127
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1368 ;; If fill prefix is shorter than a new |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1369 ;; fill prefix computed here, end paragraph. |
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1370 (let ((this-line-fill-prefix |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1371 (fill-individual-paragraphs-prefix |
25127
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1372 citation-regexp))) |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49315
diff
changeset
|
1373 (>= (length fill-prefix) |
25127
864a4f79195b
(fill-individual-paragraphs): Calculate new
Karl Heuer <kwzh@gnu.org>
parents:
25126
diff
changeset
|
1374 (length this-line-fill-prefix))) |
638 | 1375 (save-excursion |
32230 | 1376 (not (progn (forward-char |
1377 (length fill-prefix)) | |
19929
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1378 (or (looking-at "[ \t]") |
0ccbd9bdcd8f
(canonically-space-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
19810
diff
changeset
|
1379 (looking-at paragraph-separate) |
28489
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1380 (looking-at paragraph-start))))) |
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1381 (not (and (equal fill-prefix "") |
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1382 citation-regexp |
3fe2e55e31da
(fill-individual-paragraphs): If a no-prefix
Gerd Moellmann <gerd@gnu.org>
parents:
27287
diff
changeset
|
1383 (looking-at citation-regexp)))))))) |
474 | 1384 ;; Fill this paragraph, but don't add a newline at the end. |
1385 (let ((had-newline (bolp))) | |
10468
d0854b6f3216
(set-justification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10423
diff
changeset
|
1386 (fill-region-as-paragraph start (point) justify) |
23184
973ac8db2f92
(fill-individual-paragraphs): Before deleting
Karl Heuer <kwzh@gnu.org>
parents:
22748
diff
changeset
|
1387 (if (and (bolp) (not had-newline)) |
973ac8db2f92
(fill-individual-paragraphs): Before deleting
Karl Heuer <kwzh@gnu.org>
parents:
22748
diff
changeset
|
1388 (delete-char -1)))))))) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1389 (defun fill-individual-paragraphs-prefix (citation-regexp) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1390 (let* ((adaptive-fill-first-line-regexp ".*") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1391 (just-one-line-prefix |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1392 ;; Accept any prefix rather than just the ones matched by |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1393 ;; adaptive-fill-first-line-regexp. |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1394 (fill-context-prefix (point) (line-beginning-position 2))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1395 (two-lines-prefix |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1396 (fill-context-prefix (point) (line-beginning-position 3)))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1397 (if (not just-one-line-prefix) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1398 (buffer-substring |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1399 (point) (save-excursion (skip-chars-forward " \t") (point))) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1400 ;; 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
|
1401 ;; 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
|
1402 ;; except perhaps with longer whitespace. |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1403 (if (and just-one-line-prefix two-lines-prefix |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1404 (let* ((one-line-citation-part |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1405 (fill-individual-paragraphs-citation |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1406 just-one-line-prefix citation-regexp)) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1407 (two-lines-citation-part |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1408 (fill-individual-paragraphs-citation |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1409 two-lines-prefix citation-regexp)) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1410 (adjusted-two-lines-citation-part |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1411 (substring two-lines-citation-part 0 |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1412 (string-match "[ \t]*\\'" |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1413 two-lines-citation-part)))) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1414 (and |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1415 (string-match (concat "\\`" |
32230 | 1416 (regexp-quote |
1417 adjusted-two-lines-citation-part) | |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1418 "[ \t]*\\'") |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1419 one-line-citation-part) |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1420 (>= (string-width one-line-citation-part) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1421 (string-width two-lines-citation-part))))) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1422 two-lines-prefix |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1423 just-one-line-prefix)))) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1424 |
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1425 (defun fill-individual-paragraphs-citation (string citation-regexp) |
40486
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1426 (if citation-regexp |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1427 (if (string-match citation-regexp string) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1428 (match-string 0 string) |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1429 "") |
b5f06f88b686
(sentence-end-double-space, sentence-end-without-period): Move to paragraphs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38910
diff
changeset
|
1430 string)) |
22748
8d234814a5a6
(fill-individual-paragraphs-prefix): New
Richard M. Stallman <rms@gnu.org>
parents:
22728
diff
changeset
|
1431 |
89909 | 1432 ;;; arch-tag: 727ad455-1161-4fa9-8df5-0f74b179216d |
732 | 1433 ;;; fill.el ends here |