annotate lisp/paragraphs.el @ 2553:b880fa9b5d8a

[xemacs-hg @ 2005-02-03 17:33:50 by james] Fix the C++ build the rest of the way. See xemacs-patches message with ID <ps4qgteel0.fsf@diannao.ittc.ku.edu>.
author james
date Thu, 03 Feb 2005 17:34:03 +0000
parents 9ec13301bb30
children c69008aaa9bc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
1 ;;; paragraphs.el --- paragraph and sentence parsing
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
3 ;; Copyright (C) 1985, 86, 87, 91, 94, 95, 96, 1997, 1999, 2000, 2001
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
4 ;; Free Software Foundation, Inc.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 ;; Maintainer: FSF
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 ;; Keywords: wp, dumped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 ;; along with XEmacs; see the file COPYING. If not, write to the Free
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 ;; 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
26 ;;; Synched up with: FSF 21.3.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ;; This file is dumped with XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;; This package provides the paragraph-oriented commands documented in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 ;; XEmacs Reference Manual.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 ;; 06/11/1997 - Use char-(after|before) instead of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ;; (following|preceding)-char. -slb
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39
2553
b880fa9b5d8a [xemacs-hg @ 2005-02-03 17:33:50 by james]
james
parents: 2549
diff changeset
40 (require 'easy-mmode)
b880fa9b5d8a [xemacs-hg @ 2005-02-03 17:33:50 by james]
james
parents: 2549
diff changeset
41
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
42 (defgroup paragraphs nil
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
43 "Paragraph and sentence parsing."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
44 :group 'editing)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
46 (define-minor-mode use-hard-newlines
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 "Minor mode to distinguish hard and soft newlines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 When active, the functions `newline' and `open-line' add the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 text-property `hard' to newlines that they insert, and a line is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 only considered as a candidate to match `paragraph-start' or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 `paragraph-separate' if it follows a hard newline.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 Prefix argument says to turn mode on if positive, off if negative.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 When the mode is turned on, if there are newlines in the buffer but no hard
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
55 newlines, ask the user whether to mark as hard any newlines preceeding a
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 `paragraph-start' line. From a program, second arg INSERT specifies whether
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 to do this; it can be `never' to change nothing, t or `always' to force
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
58 marking, `guess' to try to do the right thing with no questions, nil
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 or anything else to ask the user.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 Newlines not marked hard are called \"soft\", and are always internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 to paragraphs. The fill functions insert and delete only soft newlines."
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
63 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
64 :extra-args (insert)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
65 (when use-hard-newlines
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 ;; Turn mode on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 ;; Intuit hard newlines --
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 ;; mark as hard any newlines preceding a paragraph-start line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 (if (or (eq insert t) (eq insert 'always)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 (and (not (eq 'never insert))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 (not (text-property-any (point-min) (point-max) 'hard t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 (search-forward "\n" nil t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 (or (eq insert 'guess)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 (y-or-n-p "Make newlines between paragraphs hard? "))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79 (while (search-forward "\n" nil t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 (let ((pos (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
82 (when (looking-at paragraph-start)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
83 (set-hard-newline-properties (1- pos) pos))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
84 ;; If paragraph-separate, newline after it is hard too.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
85 (when (looking-at paragraph-separate)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
86 (set-hard-newline-properties (1- pos) pos)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
87 (end-of-line)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
88 (unless (eobp)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
89 (set-hard-newline-properties (point) (1+ (point)))))))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
91 (defcustom paragraph-start "\f\\|[ \t]*$" "\
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 *Regexp for beginning of a line that starts OR separates paragraphs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 This regexp should match lines that separate paragraphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 and should also match lines that start a paragraph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 \(and are part of that paragraph).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 This is matched against the text at the left margin, which is not necessarily
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 the beginning of the line, so it should never use \"^\" as an anchor. This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 ensures that the paragraph functions will work equally well within a region
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 of text indented by a margin setting.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 The variable `paragraph-separate' specifies how to distinguish
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 lines that start paragraphs from lines that separate them.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105 If the variable `use-hard-newlines' is non-nil, then only lines following a
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
106 hard newline are considered to match."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
107 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
108 :type 'regexp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 ;; paragraph-start requires a hard newline, but paragraph-separate does not:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 ;; It is assumed that paragraph-separate is distinctive enough to be believed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 ;; whenever it occurs, while it is reasonable to set paragraph-start to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113 ;; something very minimal, even including "." (which makes every hard newline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114 ;; start a new paragraph).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
116 (defcustom paragraph-separate "[ \t\f]*$"
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
117 "*Regexp for beginning of a line that separates paragraphs.
450
98528da0b7fc Import from CVS: tag r21-2-40
cvs
parents: 446
diff changeset
118 If you change this, you may have to change `paragraph-start' also.
98528da0b7fc Import from CVS: tag r21-2-40
cvs
parents: 446
diff changeset
119
98528da0b7fc Import from CVS: tag r21-2-40
cvs
parents: 446
diff changeset
120 A line matching this is not part of any paragraph.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 This is matched against the text at the left margin, which is not necessarily
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 the beginning of the line, so it should not use \"^\" as an anchor. This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 ensures that the paragraph functions will work equally within a region of
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
125 text indented by a margin setting."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
126 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
127 :type 'regexp)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
128
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
129 (defcustom sentence-end-double-space t
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
130 "*Non-nil means a single space does not end a sentence.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
131 This is relevant for filling. See also `sentence-end-without-period'
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
132 and `colon-double-space'.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
133
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
134 This variable applies only to filling, not motion commands. To
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
135 change the behavior of motion commands, see `sentence-end'.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
136
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
137 If you change this, you should also change `sentence-end'. See Info
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
138 node `Sentences'."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
139 :type 'boolean
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
140 :group 'fill)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
142 (defcustom sentence-end-without-period nil
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
143 "*Non-nil means a sentence will end without a period.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
144 For example, a sentence in Thai text ends with double space but
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
145 without a period."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
146 :type 'boolean
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
147 :group 'fill)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
148
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
149 (defcustom sentence-end
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
150 (purecopy
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
151 ;; This is a bit stupid since it's not auto-updated when the
2553
b880fa9b5d8a [xemacs-hg @ 2005-02-03 17:33:50 by james]
james
parents: 2549
diff changeset
152 ;; other variables are changed, but it's still useful info.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
153 (concat (if sentence-end-without-period "\\w \\|")
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
154 "[.?!$B!#!%!)!*$A!##.#?#!$(0!$!%!)!*$(G!$!%!)!*(B][]\"')}]*"
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
155 (if sentence-end-double-space
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
156 "\\($\\| $\\|\t\\| \\)" "\\($\\|[\t ]\\)")
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
157 "[ \t\n]*"))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
158 "*Regexp describing the end of a sentence.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
159 The value includes the whitespace following the sentence.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160 All paragraph boundaries also end sentences, regardless.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
162 The default value specifies that in order to be recognized as the end
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
163 of a sentence, the ending period, question mark, or exclamation point
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
164 must be followed by two spaces, unless it's inside some sort of quotes
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
165 or parenthesis.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
166
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
167 See also the variable `sentence-end-double-space', the variable
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
168 `sentence-end-without-period' and Info node `Sentences'."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
169 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
170 :type 'regexp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
172 (defcustom page-delimiter "^\014"
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
173 "*Regexp describing line-beginnings that separate pages."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
174 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
175 :type 'regexp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
177 (defcustom paragraph-ignore-fill-prefix nil
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
178 "*Non-nil means the paragraph commands are not affected by `fill-prefix'.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
179 This is desirable in modes where blank lines are the paragraph delimiters."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
180 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
181 :type 'boolean)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
182
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
183 (defun forward-paragraph (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
184 "Move forward to end of paragraph.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
185 With argument ARG, do it ARG times;
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
186 a negative argument ARG = -N means move backward N paragraphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
188 A line which `paragraph-start' matches either separates paragraphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189 \(if `paragraph-separate' matches it also) or is the first line of a paragraph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 A paragraph end is the beginning of a line which is not part of the paragraph
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
191 to which the end of the previous line belongs, or the end of the buffer.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
192 Returns the count of paragraphs left to move."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
193 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194 (or arg (setq arg 1))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
195 (let* ((opoint (point))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
196 (fill-prefix-regexp
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
197 (and fill-prefix (not (equal fill-prefix ""))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
198 (not paragraph-ignore-fill-prefix)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
199 (regexp-quote fill-prefix)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 ;; Remove ^ from paragraph-start and paragraph-sep if they are there.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 ;; These regexps shouldn't be anchored, because we look for them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 ;; starting at the left-margin. This allows paragraph commands to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 ;; work normally with indented text.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 ;; This hack will not find problem cases like "whatever\\|^something".
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
205 (parstart (if (and (not (equal "" paragraph-start))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
206 (equal ?^ (aref paragraph-start 0)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
207 (substring paragraph-start 1)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
208 paragraph-start))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
209 (parsep (if (and (not (equal "" paragraph-separate))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
210 (equal ?^ (aref paragraph-separate 0)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
211 (substring paragraph-separate 1)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
212 paragraph-separate))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
213 (parsep
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214 (if fill-prefix-regexp
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
215 (concat parsep "\\|"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
216 fill-prefix-regexp "[ \t]*$")
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
217 parsep))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 ;; This is used for searching.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
219 (sp-parstart (concat "^[ \t]*\\(?:" parstart "\\|" parsep "\\)"))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
220 start found-start)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
221 (while (and (< arg 0) (not (bobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
222 (if (and (not (looking-at parsep))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
223 (re-search-backward "^\n" (max (1- (point)) (point-min)) t)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
224 (looking-at parsep))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
225 (setq arg (1+ arg))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
226 (setq start (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
227 ;; Move back over paragraph-separating lines.
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
228 (backward-char 1) (beginning-of-line)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
229 (while (and (not (bobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
230 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
231 (looking-at parsep)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
232 (forward-line -1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
233 (if (bobp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
234 nil
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
235 (setq arg (1+ arg))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236 ;; Go to end of the previous (non-separating) line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
237 (end-of-line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 ;; Search back for line that starts or separates paragraphs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239 (if (if fill-prefix-regexp
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
240 ;; There is a fill prefix; it overrides parstart.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241 (let (multiple-lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242 (while (and (progn (beginning-of-line) (not (bobp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
243 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
244 (not (looking-at parsep)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245 (looking-at fill-prefix-regexp))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
246 (unless (= (point) start)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
247 (setq multiple-lines t))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
248 (forward-line -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
249 (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
250 ;; This deleted code caused a long hanging-indent line
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
251 ;; not to be filled together with the following lines.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
252 ;; ;; Don't move back over a line before the paragraph
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
253 ;; ;; which doesn't start with fill-prefix
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
254 ;; ;; unless that is the only line we've moved over.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
255 ;; (and (not (looking-at fill-prefix-regexp))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
256 ;; multiple-lines
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
257 ;; (forward-line 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
258 (not (bobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
259 (while (and (re-search-backward sp-parstart nil 1)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
260 (setq found-start t)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
261 ;; Found a candidate, but need to check if it is a
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
262 ;; REAL parstart.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
263 (progn (setq start (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
264 (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
265 (not (looking-at parsep)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
266 (not (and (looking-at parstart)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
267 (or (not use-hard-newlines)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
268 (get-text-property (1- start) 'hard)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
269 (bobp)))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
270 (setq found-start nil)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271 (goto-char start))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
272 found-start)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273 ;; Found one.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 ;; Move forward over paragraph separators.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 ;; We know this cannot reach the place we started
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 ;; because we know we moved back over a non-separator.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278 (while (and (not (eobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
279 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
280 (looking-at parsep)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 (forward-line 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
282 ;; If line before paragraph is just margin, back up to there.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
283 (end-of-line 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
284 (if (> (current-column) (current-left-margin))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
285 (forward-char 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
286 (skip-chars-backward " \t")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
287 (if (not (bolp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
288 (forward-line 1))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 ;; No starter or separator line => use buffer beg.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
290 (goto-char (point-min))))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
291
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
292 (while (and (> arg 0) (not (eobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
293 ;; Move forward over separator lines...
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
294 (while (and (not (eobp))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
295 (progn (move-to-left-margin) (not (eobp)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
296 (looking-at parsep))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
297 (forward-line 1))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
298 (unless (eobp) (setq arg (1- arg)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
299 ;; ... and one more line.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
300 (forward-line 1)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
301 (if fill-prefix-regexp
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
302 ;; There is a fill prefix; it overrides parstart.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
303 (while (and (not (eobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
304 (progn (move-to-left-margin) (not (eobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
305 (not (looking-at parsep))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
306 (looking-at fill-prefix-regexp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
307 (forward-line 1))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
308 (while (and (re-search-forward sp-parstart nil 1)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
309 (progn (setq start (match-beginning 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
310 (goto-char start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311 (not (eobp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
312 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
313 (not (looking-at parsep)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
314 (or (not (looking-at parstart))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
315 (and use-hard-newlines
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
316 (not (get-text-property (1- start) 'hard)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
317 (forward-char 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
318 (if (< (point) (point-max))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
319 (goto-char start))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
320 (constrain-to-field nil opoint t)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
321 ;; Return the number of steps that could not be done.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
322 arg))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
323
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
324 (defun backward-paragraph (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
325 "Move backward to start of paragraph.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
326 With argument ARG, do it ARG times;
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
327 a negative argument ARG = -N means move forward N paragraphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
328
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329 A paragraph start is the beginning of a line which is a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330 `first-line-of-paragraph' or which is ordinary text and follows a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 paragraph-separating line; except: if the first real line of a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
332 paragraph is preceded by a blank line, the paragraph starts at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
333 blank line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
334
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
335 See `forward-paragraph' for more information."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 (or arg (setq arg 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 (forward-paragraph (- arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339
687
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
340 (defun mark-paragraph (&optional arg)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
341 "Put point at beginning of this paragraph, mark at end.
687
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
342 The paragraph marked is the one that contains point or follows point.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
343
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
344 With argument ARG, puts mark at end of a following paragraph, so that
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
345 the number of paragraphs marked equals ARG.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
346
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
347 If ARG is negative, point is put at end of this paragraph, mark is put
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
348 at beginning of this or a previous paragraph.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
349
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
350 If this command is repeated, it marks the next ARG paragraphs after (or
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
351 before, if arg is negative) the ones already marked."
687
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
352 (interactive "p")
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
353 (unless arg (setq arg 1))
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
354 (when (zerop arg)
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
355 (error "Cannot mark zero paragraphs"))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
356 (cond ((and (eq last-command this-command) (mark t))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
357 (set-mark
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
358 (save-excursion
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
359 (goto-char (mark))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
360 (forward-paragraph arg)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
361 (point))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
362 (t
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
363 (forward-paragraph arg)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
364 (push-mark nil t t)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
365 (backward-paragraph arg))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
366
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
367 (defun kill-paragraph (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
368 "Kill forward to end of paragraph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
369 With arg N, kill forward to Nth end of paragraph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
370 negative arg -N means kill backward to Nth start of paragraph."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
371 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
372 (kill-region (point) (progn (forward-paragraph arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
373
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
374 (defun backward-kill-paragraph (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
375 "Kill back to start of paragraph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
376 With arg N, kill back to Nth start of paragraph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
377 negative arg -N means kill forward to Nth end of paragraph."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
378 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
379 (kill-region (point) (progn (backward-paragraph arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
380
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
381 (defun transpose-paragraphs (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
382 "Interchange this (or next) paragraph with previous one."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
383 (interactive "*p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
384 (transpose-subr 'forward-paragraph arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
385
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
386 (defun start-of-paragraph-text ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
387 (let ((opoint (point)) npoint)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
388 (forward-paragraph -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
389 (setq npoint (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
390 (skip-chars-forward " \t\n")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
391 ;; If the range of blank lines found spans the original start point,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
392 ;; try again from the beginning of it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
393 ;; Must be careful to avoid infinite loop
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
394 ;; when following a single return at start of buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
395 (if (and (>= (point) opoint) (< npoint opoint))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
396 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
397 (goto-char npoint)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
398 (if (> npoint (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
399 (start-of-paragraph-text))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
400
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
401 (defun end-of-paragraph-text ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
402 (let ((opoint (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
403 (forward-paragraph 1)
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
404 (if (eq (char-before (point)) ?\n) (backward-char 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
405 (if (<= (point) opoint)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
406 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
407 (forward-char 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
408 (if (< (point) (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
409 (end-of-paragraph-text))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
410
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
411 (defun forward-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
412 "Move forward to next `sentence-end'. With argument, repeat.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
413 With negative argument, move backward repeatedly to `sentence-beginning'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
414
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
415 The variable `sentence-end' is a regular expression that matches ends of
450
98528da0b7fc Import from CVS: tag r21-2-40
cvs
parents: 446
diff changeset
416 sentences. A paragraph boundary also terminates a sentence."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
417 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
418 (or arg (setq arg 1))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
419 (let ((opoint (point)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
420 (while (< arg 0)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
421 (let ((pos (point))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
422 (par-beg (save-excursion (start-of-paragraph-text) (point))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
423 (if (and (re-search-backward sentence-end par-beg t)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
424 (or (< (match-end 0) pos)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
425 (re-search-backward sentence-end par-beg t)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
426 (goto-char (match-end 0))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
427 (goto-char par-beg)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
428 (setq arg (1+ arg)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
429 (while (> arg 0)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
430 (let ((par-end (save-excursion (end-of-paragraph-text) (point))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
431 (if (re-search-forward sentence-end par-end t)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
432 (skip-chars-backward " \t\n")
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
433 (goto-char par-end)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
434 (setq arg (1- arg)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
435 (constrain-to-field nil opoint t)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
436
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
437 (defun backward-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
438 "Move backward to start of sentence. With arg, do it arg times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
439 See `forward-sentence' for more information."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
440 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
441 (or arg (setq arg 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
442 (forward-sentence (- arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
443
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
444 (defun kill-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
445 "Kill from point to end of sentence.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
446 With arg, repeat; negative arg -N means kill back to Nth start of sentence."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
447 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
448 (kill-region (point) (progn (forward-sentence arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
449
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
450 (defun backward-kill-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
451 "Kill back from point to start of sentence.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
452 With arg, repeat, or kill forward to Nth end of sentence if negative arg -N."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
453 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
454 (kill-region (point) (progn (backward-sentence arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
455
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
456 (defun mark-end-of-sentence (arg)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
457 "Put mark at end of sentence. Arg works as in `forward-sentence'.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
458 If this command is repeated, it marks the next ARG sentences after the
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
459 ones already marked."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
460 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
461 ;; FSF Version:
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
462 ; (push-mark
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
463 ; (save-excursion
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
464 ; (if (and (eq last-command this-command) (mark t))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
465 ; (goto-char (mark)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
466 ; (forward-sentence arg)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
467 ; (point))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
468 ; nil t))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
469 (mark-something 'mark-end-of-sentence 'forward-sentence arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471 (defun mark-end-of-line (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
472 "Put mark at end of line. Arg works as in `end-of-line'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
473 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
474 (mark-something 'mark-end-of-line 'end-of-line arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
476 (defun transpose-sentences (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
477 "Interchange this (next) and previous sentence."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
478 (interactive "*p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
479 (transpose-subr 'forward-sentence arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
481 ;;; Local Variables:
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
482 ;;; coding: iso-2022-7bit
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
483 ;;; End:
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
484
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
485 ;;; paragraphs.el ends here