Mercurial > emacs
annotate lisp/textmodes/paragraphs.el @ 18060:640305a5c871
Comment changes.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 31 May 1997 04:09:04 +0000 |
parents | 834a1033dc76 |
children | c8c9212a86a7 |
rev | line source |
---|---|
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
1 ;;; paragraphs.el --- paragraph and sentence parsing. |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
2 |
16022
ac3fea1b270e
Add 1996 to copyright notice.
Richard M. Stallman <rms@gnu.org>
parents:
16019
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 87, 91, 94, 95, 96 Free Software Foundation, Inc. |
845 | 4 |
789
71d052f72ac1
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
5 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
804
diff
changeset
|
6 ;; Keywords: wp |
789
71d052f72ac1
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
7 |
36 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
804 | 12 ;; the Free Software Foundation; either version 2, or (at your option) |
36 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
36 | 24 |
2308
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1462
diff
changeset
|
25 ;;; Commentary: |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1462
diff
changeset
|
26 |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1462
diff
changeset
|
27 ;; This package provides the paragraph-oriented commands documented in the |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1462
diff
changeset
|
28 ;; Emacs manual. |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1462
diff
changeset
|
29 |
789
71d052f72ac1
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
30 ;;; Code: |
36 | 31 |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
32 (defvar use-hard-newlines nil |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
33 "Non-nil means to distinguish hard and soft newlines. |
16019
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
34 See documentation for the `use-hard-newlines' function.") |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
35 (make-variable-buffer-local 'use-hard-newlines) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
36 |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
37 (defun use-hard-newlines (&optional arg insert) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
38 "Minor mode to distinguish hard and soft newlines. |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
39 When active, the functions `newline' and `open-line' add the |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
40 text-property `hard' to newlines that they insert, and a line is |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
41 only considered as a candidate to match `paragraph-start' or |
16019
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
42 `paragraph-separate' if it follows a hard newline. |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
43 |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
44 Prefix argument says to turn mode on if positive, off if negative. |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
45 When the mode is turned on, if there are newlines in the buffer but no hard |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
46 newlines, ask the user whether to mark as hard any newlines preceeding a |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
47 `paragraph-start' line. From a program, second arg INSERT specifies whether |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
48 to do this; it can be `never' to change nothing, t or `always' to force |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
49 marking, `guess' to try to do the right thing with no questions, nil |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
50 or anything else to ask the user. |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
51 |
16019
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
52 Newlines not marked hard are called \"soft\", and are always internal |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
53 to paragraphs. The fill functions insert and delete only soft newlines." |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
54 (interactive (list current-prefix-arg nil)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
55 (if (or (<= (prefix-numeric-value arg) 0) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
56 (and use-hard-newlines (null arg))) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
57 ;; Turn mode off |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
58 (setq use-hard-newlines nil) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
59 ;; Turn mode on |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
60 ;; Intuit hard newlines -- |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
61 ;; mark as hard any newlines preceding a paragraph-start line. |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
62 (if (or (eq insert t) (eq insert 'always) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
63 (and (not (eq 'never insert)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
64 (not use-hard-newlines) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
65 (not (text-property-any (point-min) (point-max) 'hard t)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
66 (save-excursion |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
67 (goto-char (point-min)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
68 (search-forward "\n" nil t)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
69 (or (eq insert 'guess) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
70 (y-or-n-p "Make newlines between paragraphs hard? ")))) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
71 (save-excursion |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
72 (goto-char (point-min)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
73 (while (search-forward "\n" nil t) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
74 (let ((pos (point))) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
75 (move-to-left-margin) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
76 (if (looking-at paragraph-start) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
77 (progn |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
78 (set-hard-newline-properties (1- pos) pos) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
79 ;; If paragraph-separate, newline after it is hard too. |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
80 (if (looking-at paragraph-separate) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
81 (progn |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
82 (end-of-line) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
83 (if (not (eobp)) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
84 (set-hard-newline-properties |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
85 (point) (1+ (point)))))))))))) |
99cc9a8dd157
(use-hard-newlines): New minor mode function.
Richard M. Stallman <rms@gnu.org>
parents:
14378
diff
changeset
|
86 (setq use-hard-newlines t))) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
87 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16328
diff
changeset
|
88 (defvar paragraph-start "[ \t\n\f]" "\ |
4585
04e78c728252
(paragraph-start): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2828
diff
changeset
|
89 *Regexp for beginning of a line that starts OR separates paragraphs. |
04e78c728252
(paragraph-start): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2828
diff
changeset
|
90 This regexp should match lines that separate paragraphs |
04e78c728252
(paragraph-start): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2828
diff
changeset
|
91 and should also match lines that start a paragraph |
04e78c728252
(paragraph-start): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2828
diff
changeset
|
92 \(and are part of that paragraph). |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
93 |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
94 This is matched against the text at the left margin, which is not necessarily |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
95 the beginning of the line, so it should never use \"^\" as an anchor. This |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
96 ensures that the paragraph functions will work equally well within a region |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
97 of text indented by a margin setting. |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
98 |
4585
04e78c728252
(paragraph-start): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2828
diff
changeset
|
99 The variable `paragraph-separate' specifies how to distinguish |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
100 lines that start paragraphs from lines that separate them. |
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
101 |
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
102 If the variable `use-hard-newlines' is nonnil, then only lines following a |
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
103 hard newline are considered to match.") |
264 | 104 |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
105 ;; paragraph-start requires a hard newline, but paragraph-separate does not: |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
106 ;; It is assumed that paragraph-separate is distinctive enough to be believed |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
107 ;; whenever it occurs, while it is reasonable to set paragraph-start to |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
108 ;; something very minimal, even including "." (which makes every hard newline |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
109 ;; start a new paragraph). |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
110 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16328
diff
changeset
|
111 (defvar paragraph-separate "[ \t\f]*$" "\ |
269 | 112 *Regexp for beginning of a line that separates paragraphs. |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
113 If you change this, you may have to change paragraph-start also. |
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
114 |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
115 This is matched against the text at the left margin, which is not necessarily |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
116 the beginning of the line, so it should not use \"^\" as an anchor. This |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
117 ensures that the paragraph functions will work equally within a region of |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
118 text indented by a margin setting.") |
264 | 119 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16328
diff
changeset
|
120 (defvar sentence-end (purecopy "[.?!][]\"')}]*\\($\\| $\\|\t\\| \\)[ \t\n]*") "\ |
269 | 121 *Regexp describing the end of a sentence. |
2503
fb3509fdf8b7
Sat Apr 10 00:39:29 1993 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
2308
diff
changeset
|
122 All paragraph boundaries also end sentences, regardless. |
fb3509fdf8b7
Sat Apr 10 00:39:29 1993 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
2308
diff
changeset
|
123 |
fb3509fdf8b7
Sat Apr 10 00:39:29 1993 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
2308
diff
changeset
|
124 In order to be recognized as the end of a sentence, the ending period, |
fb3509fdf8b7
Sat Apr 10 00:39:29 1993 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
2308
diff
changeset
|
125 question mark, or exclamation point must be followed by two spaces, |
fb3509fdf8b7
Sat Apr 10 00:39:29 1993 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
2308
diff
changeset
|
126 unless it's inside some sort of quotes or parenthesis.") |
264 | 127 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16328
diff
changeset
|
128 (defvar page-delimiter "^\014" "\ |
269 | 129 *Regexp describing line-beginnings that separate pages.") |
264 | 130 |
269 | 131 (defvar paragraph-ignore-fill-prefix nil "\ |
132 Non-nil means the paragraph commands are not affected by `fill-prefix'. | |
133 This is desirable in modes where blank lines are the paragraph delimiters.") | |
264 | 134 |
36 | 135 (defun forward-paragraph (&optional arg) |
136 "Move forward to end of paragraph. | |
16757
e1c2e9a44236
(forward-paragraph, backward-paragraph): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
137 With argument ARG, do it ARG times; |
e1c2e9a44236
(forward-paragraph, backward-paragraph): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
138 a negative argument ARG = -N means move backward N paragraphs. |
36 | 139 |
140 A line which `paragraph-start' matches either separates paragraphs | |
141 \(if `paragraph-separate' matches it also) or is the first line of a paragraph. | |
142 A paragraph end is the beginning of a line which is not part of the paragraph | |
143 to which the end of the previous line belongs, or the end of the buffer." | |
144 (interactive "p") | |
145 (or arg (setq arg 1)) | |
146 (let* ((fill-prefix-regexp | |
147 (and fill-prefix (not (equal fill-prefix "")) | |
148 (not paragraph-ignore-fill-prefix) | |
149 (regexp-quote fill-prefix))) | |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
150 ;; Remove ^ from paragraph-start and paragraph-sep if they are there. |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
151 ;; These regexps shouldn't be anchored, because we look for them |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
152 ;; starting at the left-margin. This allows paragraph commands to |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
153 ;; work normally with indented text. |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
154 ;; This hack will not find problem cases like "whatever\\|^something". |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
155 (paragraph-start (if (and (not (equal "" paragraph-start)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
156 (equal ?^ (aref paragraph-start 0))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
157 (substring paragraph-start 1) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
158 paragraph-start)) |
17569
834a1033dc76
(forward-paragraph): Fix editing error
Richard M. Stallman <rms@gnu.org>
parents:
16757
diff
changeset
|
159 (paragraph-separate (if (and (not (equal "" paragraph-separate)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
160 (equal ?^ (aref paragraph-separate 0))) |
17569
834a1033dc76
(forward-paragraph): Fix editing error
Richard M. Stallman <rms@gnu.org>
parents:
16757
diff
changeset
|
161 (substring paragraph-separate 1) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
162 paragraph-separate)) |
36 | 163 (paragraph-separate |
164 (if fill-prefix-regexp | |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
165 (concat paragraph-separate "\\|" |
36 | 166 fill-prefix-regexp "[ \t]*$") |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
167 paragraph-separate)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
168 ;; This is used for searching. |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
169 (sp-paragraph-start (concat "^[ \t]*\\(" paragraph-start "\\)")) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
170 start) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
171 (while (and (< arg 0) (not (bobp))) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
172 (if (and (not (looking-at paragraph-separate)) |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
173 (re-search-backward "^\n" (max (1- (point)) (point-min)) t) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
174 (looking-at paragraph-separate)) |
36 | 175 nil |
12717
8e153c7bbd90
(forward-paragraph): Don't move back over a line
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
176 (setq start (point)) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
177 ;; Move back over paragraph-separating lines. |
36 | 178 (forward-char -1) (beginning-of-line) |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
179 (while (and (not (bobp)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
180 (progn (move-to-left-margin) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
181 (looking-at paragraph-separate))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
182 (forward-line -1)) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
183 (if (bobp) |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
184 nil |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
185 ;; Go to end of the previous (non-separating) line. |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
186 (end-of-line) |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
187 ;; Search back for line that starts or separates paragraphs. |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
188 (if (if fill-prefix-regexp |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
189 ;; There is a fill prefix; it overrides paragraph-start. |
12717
8e153c7bbd90
(forward-paragraph): Don't move back over a line
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
190 (let (multiple-lines) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
191 (while (and (progn (beginning-of-line) (not (bobp))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
192 (progn (move-to-left-margin) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
193 (not (looking-at paragraph-separate))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
194 (looking-at fill-prefix-regexp)) |
12717
8e153c7bbd90
(forward-paragraph): Don't move back over a line
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
195 (if (not (= (point) start)) |
8e153c7bbd90
(forward-paragraph): Don't move back over a line
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
196 (setq multiple-lines t)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
197 (forward-line -1)) |
12717
8e153c7bbd90
(forward-paragraph): Don't move back over a line
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
198 (move-to-left-margin) |
16328
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
199 ;;; This deleted code caused a long hanging-indent line |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
200 ;;; not to be filled together with the following lines. |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
201 ;;; ;; Don't move back over a line before the paragraph |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
202 ;;; ;; which doesn't start with fill-prefix |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
203 ;;; ;; unless that is the only line we've moved over. |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
204 ;;; (and (not (looking-at fill-prefix-regexp)) |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
205 ;;; multiple-lines |
5aff0b539ae0
(forward-paragraph): Don't ever move forward again across a line if we
Richard M. Stallman <rms@gnu.org>
parents:
16022
diff
changeset
|
206 ;;; (forward-line 1)) |
12717
8e153c7bbd90
(forward-paragraph): Don't move back over a line
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
207 (not (bobp))) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
208 (while (and (re-search-backward sp-paragraph-start nil 1) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
209 ;; Found a candidate, but need to check if it is a |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
210 ;; REAL paragraph-start. |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
211 (not (bobp)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
212 (progn (setq start (point)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
213 (move-to-left-margin) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
214 (not (looking-at paragraph-separate))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
215 (or (not (looking-at paragraph-start)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
216 (and use-hard-newlines |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
217 (not (get-text-property (1- start) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
218 'hard))))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
219 (goto-char start)) |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
220 (> (point) (point-min))) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
221 ;; Found one. |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
222 (progn |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
223 ;; Move forward over paragraph separators. |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
224 ;; We know this cannot reach the place we started |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
225 ;; because we know we moved back over a non-separator. |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
226 (while (and (not (eobp)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
227 (progn (move-to-left-margin) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
228 (looking-at paragraph-separate))) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
229 (forward-line 1)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
230 ;; If line before paragraph is just margin, back up to there. |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
231 (end-of-line 0) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
232 (if (> (current-column) (current-left-margin)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
233 (forward-char 1) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
234 (skip-chars-backward " \t") |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
235 (if (not (bolp)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
236 (forward-line 1)))) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
237 ;; No starter or separator line => use buffer beg. |
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
238 (goto-char (point-min))))) |
36 | 239 (setq arg (1+ arg))) |
5608
c4c662362d39
(forward-paragraph): If moving back we find nothing
Richard M. Stallman <rms@gnu.org>
parents:
4585
diff
changeset
|
240 (while (and (> arg 0) (not (eobp))) |
14378
2110ae3ef540
(forward-paragraph): Comment change.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
241 ;; Move forward over separator lines, and one more line. |
36 | 242 (while (prog1 (and (not (eobp)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
243 (progn (move-to-left-margin) (not (eobp))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
244 (looking-at paragraph-separate)) |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
245 (forward-line 1))) |
36 | 246 (if fill-prefix-regexp |
247 ;; There is a fill prefix; it overrides paragraph-start. | |
248 (while (and (not (eobp)) | |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
249 (progn (move-to-left-margin) (not (eobp))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
250 (not (looking-at paragraph-separate)) |
36 | 251 (looking-at fill-prefix-regexp)) |
252 (forward-line 1)) | |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
253 (while (and (re-search-forward sp-paragraph-start nil 1) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
254 (progn (setq start (match-beginning 0)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
255 (goto-char start) |
12804
1619fcabdb99
(forward-paragraph): Don't overlook a paragraph-start
Richard M. Stallman <rms@gnu.org>
parents:
12717
diff
changeset
|
256 (not (eobp))) |
1619fcabdb99
(forward-paragraph): Don't overlook a paragraph-start
Richard M. Stallman <rms@gnu.org>
parents:
12717
diff
changeset
|
257 (progn (move-to-left-margin) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
258 (not (looking-at paragraph-separate))) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
259 (or (not (looking-at paragraph-start)) |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
260 (and use-hard-newlines |
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
261 (not (get-text-property (1- start) 'hard))))) |
10424
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
262 (forward-char 1)) |
6bcb93cec6f8
(forward-paragraph): Notice use-hard-newlines value.
Richard M. Stallman <rms@gnu.org>
parents:
9169
diff
changeset
|
263 (if (< (point) (point-max)) |
10864
33769cbeb58e
(paragraph-start, paragraph-separate): Default values no longer start
Boris Goldowsky <boris@gnu.org>
parents:
10464
diff
changeset
|
264 (goto-char start))) |
36 | 265 (setq arg (1- arg))))) |
266 | |
267 (defun backward-paragraph (&optional arg) | |
268 "Move backward to start of paragraph. | |
16757
e1c2e9a44236
(forward-paragraph, backward-paragraph): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
269 With argument ARG, do it ARG times; |
e1c2e9a44236
(forward-paragraph, backward-paragraph): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
16687
diff
changeset
|
270 a negative argument ARG = -N means move forward N paragraphs. |
36 | 271 |
237 | 272 A paragraph start is the beginning of a line which is a |
273 `first-line-of-paragraph' or which is ordinary text and follows a | |
274 paragraph-separating line; except: if the first real line of a | |
275 paragraph is preceded by a blank line, the paragraph starts at that | |
276 blank line. | |
277 | |
278 See `forward-paragraph' for more information." | |
36 | 279 (interactive "p") |
280 (or arg (setq arg 1)) | |
281 (forward-paragraph (- arg))) | |
282 | |
283 (defun mark-paragraph () | |
284 "Put point at beginning of this paragraph, mark at end. | |
285 The paragraph marked is the one that contains point or follows point." | |
286 (interactive) | |
287 (forward-paragraph 1) | |
2827
0daa9d777306
(mark-paragraph): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2503
diff
changeset
|
288 (push-mark nil t t) |
36 | 289 (backward-paragraph 1)) |
290 | |
291 (defun kill-paragraph (arg) | |
292 "Kill forward to end of paragraph. | |
293 With arg N, kill forward to Nth end of paragraph; | |
294 negative arg -N means kill backward to Nth start of paragraph." | |
237 | 295 (interactive "p") |
7064
19a84bb30e9e
(kill-paragraph): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
5653
diff
changeset
|
296 (kill-region (point) (progn (forward-paragraph arg) (point)))) |
36 | 297 |
298 (defun backward-kill-paragraph (arg) | |
299 "Kill back to start of paragraph. | |
300 With arg N, kill back to Nth start of paragraph; | |
301 negative arg -N means kill forward to Nth end of paragraph." | |
237 | 302 (interactive "p") |
7064
19a84bb30e9e
(kill-paragraph): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
5653
diff
changeset
|
303 (kill-region (point) (progn (backward-paragraph arg) (point)))) |
36 | 304 |
305 (defun transpose-paragraphs (arg) | |
306 "Interchange this (or next) paragraph with previous one." | |
307 (interactive "*p") | |
308 (transpose-subr 'forward-paragraph arg)) | |
309 | |
310 (defun start-of-paragraph-text () | |
311 (let ((opoint (point)) npoint) | |
312 (forward-paragraph -1) | |
313 (setq npoint (point)) | |
314 (skip-chars-forward " \t\n") | |
68 | 315 ;; If the range of blank lines found spans the original start point, |
316 ;; try again from the beginning of it. | |
317 ;; Must be careful to avoid infinite loop | |
318 ;; when following a single return at start of buffer. | |
319 (if (and (>= (point) opoint) (< npoint opoint)) | |
36 | 320 (progn |
321 (goto-char npoint) | |
322 (if (> npoint (point-min)) | |
323 (start-of-paragraph-text)))))) | |
324 | |
325 (defun end-of-paragraph-text () | |
326 (let ((opoint (point))) | |
327 (forward-paragraph 1) | |
328 (if (eq (preceding-char) ?\n) (forward-char -1)) | |
329 (if (<= (point) opoint) | |
330 (progn | |
331 (forward-char 1) | |
332 (if (< (point) (point-max)) | |
333 (end-of-paragraph-text)))))) | |
334 | |
335 (defun forward-sentence (&optional arg) | |
2503
fb3509fdf8b7
Sat Apr 10 00:39:29 1993 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
2308
diff
changeset
|
336 "Move forward to next `sentence-end'. With argument, repeat. |
237 | 337 With negative argument, move backward repeatedly to `sentence-beginning'. |
36 | 338 |
237 | 339 The variable `sentence-end' is a regular expression that matches ends of |
340 sentences. Also, every paragraph boundary terminates sentences as well." | |
36 | 341 (interactive "p") |
342 (or arg (setq arg 1)) | |
343 (while (< arg 0) | |
344 (let ((par-beg (save-excursion (start-of-paragraph-text) (point)))) | |
345 (if (re-search-backward (concat sentence-end "[^ \t\n]") par-beg t) | |
346 (goto-char (1- (match-end 0))) | |
347 (goto-char par-beg))) | |
348 (setq arg (1+ arg))) | |
349 (while (> arg 0) | |
350 (let ((par-end (save-excursion (end-of-paragraph-text) (point)))) | |
351 (if (re-search-forward sentence-end par-end t) | |
352 (skip-chars-backward " \t\n") | |
353 (goto-char par-end))) | |
354 (setq arg (1- arg)))) | |
355 | |
356 (defun backward-sentence (&optional arg) | |
357 "Move backward to start of sentence. With arg, do it arg times. | |
237 | 358 See `forward-sentence' for more information." |
36 | 359 (interactive "p") |
360 (or arg (setq arg 1)) | |
361 (forward-sentence (- arg))) | |
362 | |
363 (defun kill-sentence (&optional arg) | |
364 "Kill from point to end of sentence. | |
365 With arg, repeat; negative arg -N means kill back to Nth start of sentence." | |
9169
edc1c9086c5c
(backward-kill-sentence): Work in read-only buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
366 (interactive "p") |
7064
19a84bb30e9e
(kill-paragraph): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
5653
diff
changeset
|
367 (kill-region (point) (progn (forward-sentence arg) (point)))) |
36 | 368 |
369 (defun backward-kill-sentence (&optional arg) | |
370 "Kill back from point to start of sentence. | |
371 With arg, repeat, or kill forward to Nth end of sentence if negative arg -N." | |
9169
edc1c9086c5c
(backward-kill-sentence): Work in read-only buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
372 (interactive "p") |
7064
19a84bb30e9e
(kill-paragraph): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
5653
diff
changeset
|
373 (kill-region (point) (progn (backward-sentence arg) (point)))) |
36 | 374 |
375 (defun mark-end-of-sentence (arg) | |
237 | 376 "Put mark at end of sentence. Arg works as in `forward-sentence'." |
36 | 377 (interactive "p") |
378 (push-mark | |
379 (save-excursion | |
380 (forward-sentence arg) | |
2828
abc6df78588f
(mark-end-of-sentence): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2827
diff
changeset
|
381 (point)) |
abc6df78588f
(mark-end-of-sentence): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2827
diff
changeset
|
382 nil t)) |
36 | 383 |
384 (defun transpose-sentences (arg) | |
385 "Interchange this (next) and previous sentence." | |
386 (interactive "*p") | |
387 (transpose-subr 'forward-sentence arg)) | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
388 |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
389 ;;; paragraphs.el ends here |