annotate lisp/textmodes/fill.el @ 33441:b938b9d018a3

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