annotate lisp/textmodes/fill.el @ 61864:af1b504ffc35

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