annotate lisp/paragraphs.el @ 4792:95b04754ea8c

Make #'equalp more compatible with CL; add a compiler macro, test & doc it. lisp/ChangeLog addition: 2009-11-08 Aidan Kehoe <kehoea@parhasard.net> * cl-extra.el (cl-string-vector-equalp) (cl-bit-vector-vector-equalp, cl-vector-array-equalp) (cl-hash-table-contents-equalp): New functions, to implement equalp treating arrays with identical contents as equivalent, as specified by Common Lisp. (equalp): Revise this function to implement array equivalence, and the hash-table equalp behaviour specified by CL. * cl-macs.el (equalp): Add a compiler macro for this function, used when one of the arguments is constant, and as such, its type is known at compile time. man/ChangeLog addition: 2009-11-08 Aidan Kehoe <kehoea@parhasard.net> * lispref/objects.texi (Equality Predicates): Document #'equalp here, as well as #'equal and #'eq. tests/ChangeLog addition: 2009-12-31 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: Test much of the functionality of equalp; add a pointer to Paul Dietz' ANSI test suite for this function, converted to Emacs Lisp. Not including the tests themselves in XEmacs because who owns the copyright on the files is unclear and the GCL people didn't respond to my queries.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 31 Dec 2009 15:09:41 +0000
parents b4f4e0cc90f1
children 7d06a8bf47d2 f62141fe007d
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
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
40 (defgroup paragraphs nil
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
41 "Paragraph and sentence parsing."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
42 :group 'editing)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
44 (define-minor-mode use-hard-newlines
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 "Minor mode to distinguish hard and soft newlines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 When active, the functions `newline' and `open-line' add the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 text-property `hard' to newlines that they insert, and a line is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 only considered as a candidate to match `paragraph-start' or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 `paragraph-separate' if it follows a hard newline.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 Prefix argument says to turn mode on if positive, off if negative.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 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
53 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
54 `paragraph-start' line. From a program, second arg INSERT specifies whether
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 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
56 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
57 or anything else to ask the user.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 Newlines not marked hard are called \"soft\", and are always internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 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
61 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
62 :extra-args (insert)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
63 (when use-hard-newlines
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 ;; Turn mode on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 ;; Intuit hard newlines --
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 ;; mark as hard any newlines preceding a paragraph-start line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 (if (or (eq insert t) (eq insert 'always)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 (and (not (eq 'never insert))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 (not (text-property-any (point-min) (point-max) 'hard t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 (search-forward "\n" nil t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 (or (eq insert 'guess)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 (y-or-n-p "Make newlines between paragraphs hard? "))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 (while (search-forward "\n" nil t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 (let ((pos (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79 (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
80 (when (looking-at paragraph-start)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
81 (set-hard-newline-properties (1- pos) pos))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
82 ;; 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
83 (when (looking-at paragraph-separate)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
84 (set-hard-newline-properties (1- pos) pos)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
85 (end-of-line)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
86 (unless (eobp)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
87 (set-hard-newline-properties (point) (1+ (point)))))))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
89 (defcustom paragraph-start "\f\\|[ \t]*$" "\
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 *Regexp for beginning of a line that starts OR separates paragraphs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 This regexp should match lines that separate paragraphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 and should also match lines that start a paragraph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 \(and are part of that paragraph).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 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
96 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
97 ensures that the paragraph functions will work equally well within a region
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 of text indented by a margin setting.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 The variable `paragraph-separate' specifies how to distinguish
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 lines that start paragraphs from lines that separate them.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 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
104 hard newline are considered to match."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
105 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
106 :type 'regexp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 ;; paragraph-start requires a hard newline, but paragraph-separate does not:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 ;; It is assumed that paragraph-separate is distinctive enough to be believed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 ;; whenever it occurs, while it is reasonable to set paragraph-start to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 ;; something very minimal, even including "." (which makes every hard newline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 ;; start a new paragraph).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
114 (defcustom paragraph-separate "[ \t\f]*$"
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
115 "*Regexp for beginning of a line that separates paragraphs.
450
98528da0b7fc Import from CVS: tag r21-2-40
cvs
parents: 446
diff changeset
116 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
117
98528da0b7fc Import from CVS: tag r21-2-40
cvs
parents: 446
diff changeset
118 A line matching this is not part of any paragraph.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
119
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120 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
121 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
122 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
123 text indented by a margin setting."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
124 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
125 :type 'regexp)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
126
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
127 (defcustom sentence-end-double-space t
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
128 "*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
129 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
130 and `colon-double-space'.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
131
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
132 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
133 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
134
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
135 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
136 node `Sentences'."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
137 :type 'boolean
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
138 :group 'fill)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
140 (defcustom sentence-end-without-period nil
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
141 "*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
142 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
143 without a period."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
144 :type 'boolean
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
145 :group 'fill)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
146
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
147 (defcustom sentence-end
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
148 (purecopy
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
149 ;; 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
150 ;; 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
151 (concat (if sentence-end-without-period "\\w \\|")
2578
1b8351656013 [xemacs-hg @ 2005-02-10 03:16:58 by ben]
ben
parents: 2555
diff changeset
152 "[.?!"
1b8351656013 [xemacs-hg @ 2005-02-10 03:16:58 by ben]
ben
parents: 2555
diff changeset
153 (if (featurep 'mule)
1b8351656013 [xemacs-hg @ 2005-02-10 03:16:58 by ben]
ben
parents: 2555
diff changeset
154 (decode-coding-string "\033$B!#!%!)!*\033$A!##.#?#!\033$(0!$!%!)!*\033$(G!$!%!)!*\033(B" 'iso-2022-7bit)
1b8351656013 [xemacs-hg @ 2005-02-10 03:16:58 by ben]
ben
parents: 2555
diff changeset
155 "")
1b8351656013 [xemacs-hg @ 2005-02-10 03:16:58 by ben]
ben
parents: 2555
diff changeset
156 "][]\"')}]*"
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
157 (if sentence-end-double-space
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
158 "\\($\\| $\\|\t\\| \\)" "\\($\\|[\t ]\\)")
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
159 "[ \t\n]*"))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
160 "*Regexp describing the end of a sentence.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
161 The value includes the whitespace following the sentence.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 All paragraph boundaries also end sentences, regardless.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
164 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
165 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
166 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
167 or parenthesis.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
168
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
169 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
170 `sentence-end-without-period' and Info node `Sentences'."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
171 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
172 :type 'regexp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
174 (defcustom page-delimiter "^\014"
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
175 "*Regexp describing line-beginnings that separate pages."
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
176 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
177 :type 'regexp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
179 (defcustom paragraph-ignore-fill-prefix nil
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
180 "*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
181 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
182 :group 'paragraphs
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
183 :type 'boolean)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
184
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
185 (defun forward-paragraph (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
186 "Move forward to end of paragraph.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
187 With argument ARG, do it ARG times;
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
188 a negative argument ARG = -N means move backward N paragraphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 A line which `paragraph-start' matches either separates paragraphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
191 \(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
192 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
193 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
194 Returns the count of paragraphs left to move."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
195 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 (or arg (setq arg 1))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
197 (let* ((opoint (point))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
198 (fill-prefix-regexp
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
199 (and fill-prefix (not (equal fill-prefix ""))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 (not paragraph-ignore-fill-prefix)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 (regexp-quote fill-prefix)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 ;; Remove ^ from paragraph-start and paragraph-sep if they are there.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 ;; These regexps shouldn't be anchored, because we look for them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 ;; starting at the left-margin. This allows paragraph commands to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205 ;; work normally with indented text.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206 ;; 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
207 (parstart (if (and (not (equal "" paragraph-start))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
208 (equal ?^ (aref paragraph-start 0)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
209 (substring paragraph-start 1)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
210 paragraph-start))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
211 (parsep (if (and (not (equal "" paragraph-separate))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
212 (equal ?^ (aref paragraph-separate 0)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
213 (substring paragraph-separate 1)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
214 paragraph-separate))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
215 (parsep
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
216 (if fill-prefix-regexp
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
217 (concat parsep "\\|"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 fill-prefix-regexp "[ \t]*$")
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
219 parsep))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
220 ;; This is used for searching.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
221 (sp-parstart (concat "^[ \t]*\\(?:" parstart "\\|" parsep "\\)"))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
222 start found-start)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
223 (while (and (< arg 0) (not (bobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
224 (if (and (not (looking-at parsep))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
225 (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
226 (looking-at parsep))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
227 (setq arg (1+ arg))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
228 (setq start (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
229 ;; Move back over paragraph-separating lines.
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
230 (backward-char 1) (beginning-of-line)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
231 (while (and (not (bobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
232 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
233 (looking-at parsep)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
234 (forward-line -1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
235 (if (bobp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236 nil
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
237 (setq arg (1+ arg))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 ;; Go to end of the previous (non-separating) line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239 (end-of-line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
240 ;; Search back for line that starts or separates paragraphs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241 (if (if fill-prefix-regexp
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
242 ;; There is a fill prefix; it overrides parstart.
4103
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
243 (let nil ; (multiple-lines)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
244 (while (and (progn (beginning-of-line) (not (bobp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
246 (not (looking-at parsep)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
247 (looking-at fill-prefix-regexp))
4103
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
248 ; (unless (= (point) start)
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
249 ; (setq multiple-lines t))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
250 (forward-line -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251 (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
252 ;; 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
253 ;; 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
254 ;; ;; 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
255 ;; ;; which doesn't start with fill-prefix
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
256 ;; ;; 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
257 ;; (and (not (looking-at fill-prefix-regexp))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
258 ;; multiple-lines
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
259 ;; (forward-line 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
260 (not (bobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
261 (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
262 (setq found-start t)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
263 ;; 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
264 ;; REAL parstart.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
265 (progn (setq start (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
266 (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
267 (not (looking-at parsep)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
268 (not (and (looking-at parstart)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
269 (or (not use-hard-newlines)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
270 (get-text-property (1- start) 'hard)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
271 (bobp)))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
272 (setq found-start nil)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273 (goto-char start))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
274 found-start)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 ;; Found one.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 ;; Move forward over paragraph separators.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278 ;; We know this cannot reach the place we started
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
279 ;; because we know we moved back over a non-separator.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
280 (while (and (not (eobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
282 (looking-at parsep)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
283 (forward-line 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
284 ;; If line before paragraph is just margin, back up to there.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
285 (end-of-line 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
286 (if (> (current-column) (current-left-margin))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
287 (forward-char 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
288 (skip-chars-backward " \t")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 (if (not (bolp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
290 (forward-line 1))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
291 ;; 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
292 (goto-char (point-min))))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
293
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
294 (while (and (> arg 0) (not (eobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
295 ;; Move forward over separator lines...
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
296 (while (and (not (eobp))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
297 (progn (move-to-left-margin) (not (eobp)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
298 (looking-at parsep))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
299 (forward-line 1))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
300 (unless (eobp) (setq arg (1- arg)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
301 ;; ... and one more line.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
302 (forward-line 1)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
303 (if fill-prefix-regexp
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
304 ;; There is a fill prefix; it overrides parstart.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
305 (while (and (not (eobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
306 (progn (move-to-left-margin) (not (eobp)))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
307 (not (looking-at parsep))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
308 (looking-at fill-prefix-regexp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
309 (forward-line 1))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
310 (while (and (re-search-forward sp-parstart nil 1)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311 (progn (setq start (match-beginning 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
312 (goto-char start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
313 (not (eobp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
314 (progn (move-to-left-margin)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
315 (not (looking-at parsep)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
316 (or (not (looking-at parstart))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
317 (and use-hard-newlines
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
318 (not (get-text-property (1- start) 'hard)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
319 (forward-char 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
320 (if (< (point) (point-max))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
321 (goto-char start))))
4103
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
322 (if-fboundp #'constrain-to-field
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
323 (constrain-to-field nil opoint t)
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
324 (error
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
325 'void-function
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
326 "constrain-to-field not available; is xemacs-base installed?"))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
327 ;; 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
328 arg))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330 (defun backward-paragraph (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 "Move backward to start of paragraph.
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
332 With argument ARG, do it ARG times;
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
333 a negative argument ARG = -N means move forward N paragraphs.
428
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 A paragraph start is the beginning of a line which is a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 `first-line-of-paragraph' or which is ordinary text and follows a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 paragraph-separating line; except: if the first real line of a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 paragraph is preceded by a blank line, the paragraph starts at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339 blank line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
340
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
341 See `forward-paragraph' for more information."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
342 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
343 (or arg (setq arg 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
344 (forward-paragraph (- arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
345
687
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
346 (defun mark-paragraph (&optional arg)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
347 "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
348 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
349
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
350 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
351 the number of paragraphs marked equals ARG.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
352
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
353 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
354 at beginning of this or a previous paragraph.
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
355
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
356 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
357 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
358 (interactive "p")
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
359 (unless arg (setq arg 1))
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
360 (when (zerop arg)
d8c768dcca7a [xemacs-hg @ 2001-12-05 04:09:24 by youngs]
youngs
parents: 450
diff changeset
361 (error "Cannot mark zero paragraphs"))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
362 (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
363 (set-mark
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
364 (save-excursion
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
365 (goto-char (mark))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
366 (forward-paragraph arg)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
367 (point))))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
368 (t
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
369 (forward-paragraph arg)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
370 (push-mark nil t t)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
371 (backward-paragraph arg))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
372
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
373 (defun kill-paragraph (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
374 "Kill forward to end of paragraph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
375 With arg N, kill forward to Nth end of paragraph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
376 negative arg -N means kill backward to Nth start of paragraph."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
377 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
378 (kill-region (point) (progn (forward-paragraph arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
379
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
380 (defun backward-kill-paragraph (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
381 "Kill back to start of paragraph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
382 With arg N, kill back to Nth start of paragraph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
383 negative arg -N means kill forward to Nth end of paragraph."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
384 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
385 (kill-region (point) (progn (backward-paragraph arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
386
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
387 (defun transpose-paragraphs (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
388 "Interchange this (or next) paragraph with previous one."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
389 (interactive "*p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
390 (transpose-subr 'forward-paragraph arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
391
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
392 (defun start-of-paragraph-text ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
393 (let ((opoint (point)) npoint)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
394 (forward-paragraph -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
395 (setq npoint (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
396 (skip-chars-forward " \t\n")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
397 ;; If the range of blank lines found spans the original start point,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
398 ;; try again from the beginning of it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
399 ;; Must be careful to avoid infinite loop
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
400 ;; when following a single return at start of buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
401 (if (and (>= (point) opoint) (< npoint opoint))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
402 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
403 (goto-char npoint)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
404 (if (> npoint (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
405 (start-of-paragraph-text))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
406
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
407 (defun end-of-paragraph-text ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
408 (let ((opoint (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
409 (forward-paragraph 1)
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
410 (if (eq (char-before (point)) ?\n) (backward-char 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
411 (if (<= (point) opoint)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
412 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
413 (forward-char 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
414 (if (< (point) (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
415 (end-of-paragraph-text))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
416
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
417 (defun forward-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
418 "Move forward to next `sentence-end'. With argument, repeat.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
419 With negative argument, move backward repeatedly to `sentence-beginning'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
420
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
421 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
422 sentences. A paragraph boundary also terminates a sentence."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
423 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
424 (or arg (setq arg 1))
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
425 (let ((opoint (point)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
426 (while (< arg 0)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
427 (let ((pos (point))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
428 (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
429 (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
430 (or (< (match-end 0) pos)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
431 (re-search-backward sentence-end par-beg t)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
432 (goto-char (match-end 0))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
433 (goto-char par-beg)))
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 (while (> arg 0)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
436 (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
437 (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
438 (skip-chars-backward " \t\n")
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
439 (goto-char par-end)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
440 (setq arg (1- arg)))
4103
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
441 (if-fboundp #'constrain-to-field
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
442 (constrain-to-field nil opoint t)
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
443 (error
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
444 'void-function
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 2578
diff changeset
445 "constrain-to-field not available; is xemacs-base installed?"))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
446
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
447 (defun backward-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
448 "Move backward to start of sentence. With arg, do it arg times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
449 See `forward-sentence' for more information."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
450 (interactive "_p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
451 (or arg (setq arg 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
452 (forward-sentence (- arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
453
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
454 (defun kill-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
455 "Kill from point to end of sentence.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
456 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
457 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
458 (kill-region (point) (progn (forward-sentence arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
459
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
460 (defun backward-kill-sentence (&optional arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
461 "Kill back from point to start of sentence.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
462 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
463 (interactive "*p") ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
464 (kill-region (point) (progn (backward-sentence arg) (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
465
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
466 (defun mark-end-of-sentence (arg)
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
467 "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
468 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
469 ones already marked."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471 ;; FSF Version:
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
472 ; (push-mark
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
473 ; (save-excursion
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
474 ; (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
475 ; (goto-char (mark)))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
476 ; (forward-sentence arg)
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
477 ; (point))
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
478 ; nil t))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
479 (mark-something 'mark-end-of-sentence 'forward-sentence arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
481 (defun mark-end-of-line (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
482 "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
483 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 (mark-something 'mark-end-of-line 'end-of-line arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
485
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
486 (defun transpose-sentences (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
487 "Interchange this (next) and previous sentence."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
488 (interactive "*p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489 (transpose-subr 'forward-sentence arg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490
2549
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
491 ;;; Local Variables:
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
492 ;;; coding: iso-2022-7bit
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
493 ;;; End:
9ec13301bb30 [xemacs-hg @ 2005-02-03 07:15:56 by ben]
ben
parents: 687
diff changeset
494
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
495 ;;; paragraphs.el ends here