diff options
| author | Glenn Morris | 2011-02-27 17:07:29 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-27 17:07:29 -0800 |
| commit | 2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch) | |
| tree | b924eb1c22ab3bce643676162ef039f250782661 /lisp/textmodes | |
| parent | df7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff) | |
| parent | d1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff) | |
| download | emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip | |
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/paragraphs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index 70f11cf66dc..a0892b5ebba 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el | |||
| @@ -43,7 +43,7 @@ only considered as a candidate to match `paragraph-start' or | |||
| 43 | 43 | ||
| 44 | Prefix argument says to turn mode on if positive, off if negative. | 44 | Prefix argument says to turn mode on if positive, off if negative. |
| 45 | When the mode is turned on, if there are newlines in the buffer but no hard | 45 | When the mode is turned on, if there are newlines in the buffer but no hard |
| 46 | newlines, ask the user whether to mark as hard any newlines preceeding a | 46 | newlines, ask the user whether to mark as hard any newlines preceding a |
| 47 | `paragraph-start' line. From a program, second arg INSERT specifies whether | 47 | `paragraph-start' line. From a program, second arg INSERT specifies whether |
| 48 | to do this; it can be `never' to change nothing, t or `always' to force | 48 | to do this; it can be `never' to change nothing, t or `always' to force |
| 49 | marking, `guess' to try to do the right thing with no questions, nil | 49 | marking, `guess' to try to do the right thing with no questions, nil |