aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-12-24 20:47:06 +0200
committerEli Zaretskii2017-12-24 20:47:06 +0200
commit7850b7620e2bc6cb9ed43ea00f84a0ad04193fe3 (patch)
tree51ab8abb6d22ea8747bba3bed08a94370c0934e7
parentd7d3b14a99692ffee6adb1c0b643a625bdcae650 (diff)
downloademacs-7850b7620e2bc6cb9ed43ea00f84a0ad04193fe3.tar.gz
emacs-7850b7620e2bc6cb9ed43ea00f84a0ad04193fe3.zip
Adjudicate review comments for the "Text" chapter of user manual
* doc/emacs/text.texi (Text): Rearrange text for clarity. Add cross-reference to the Org manual. Make the cross-reference to Outline Mode appear in online manuals as well (the conditional was a forgotten remnant from time immemoriam). (Paragraphs): Add a note that 'paragraph-start' and 'paragraph-separate' should not be anchored. (Auto Fill): Remove redundant text. Suggested by Petteri Hintsanen <petterih@iki.fi> in emacs-manual-bugs@gnu.org.
-rw-r--r--doc/emacs/text.texi40
1 files changed, 24 insertions, 16 deletions
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 67c279a7431..3561956791d 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -22,13 +22,17 @@ are also often useful for editing programs.
22the file contains ordinary text, use Text mode, which customizes Emacs 22the file contains ordinary text, use Text mode, which customizes Emacs
23in small ways for the syntactic conventions of text. Outline mode 23in small ways for the syntactic conventions of text. Outline mode
24provides special commands for operating on text with an outline 24provides special commands for operating on text with an outline
25structure. Org mode extends Outline mode and turn Emacs into a 25structure. @xref{Outline Mode}.
26full-fledged organizer: you can manage TODO lists, store notes and
27publish them in many formats.
28 26
29@iftex 27 Org mode extends Outline mode and turns Emacs into a full-fledged
30@xref{Outline Mode}. 28organizer: you can manage TODO lists, store notes and publish them in
31@end iftex 29many formats.
30@ifinfo
31@xref{Top, The Org Manual,,org, The Org Manual}.
32@end ifinfo
33@ifnotinfo
34See the Org Info manual, which is distributed with Emacs.
35@end ifnotinfo
32 36
33@cindex nXML mode 37@cindex nXML mode
34@cindex mode, XML 38@cindex mode, XML
@@ -324,6 +328,12 @@ that start a new paragraph and are contained in it must match only
324in Fundamental mode, @code{paragraph-start} is @w{@code{"\f\\|[ 328in Fundamental mode, @code{paragraph-start} is @w{@code{"\f\\|[
325\t]*$"}}, and @code{paragraph-separate} is @w{@code{"[ \t\f]*$"}}. 329\t]*$"}}, and @code{paragraph-separate} is @w{@code{"[ \t\f]*$"}}.
326 330
331 Note that @code{paragraph-start} and @code{paragraph-separate} are
332matched against the text at the left margin, which is not necessarily
333the beginning of the line, so these regexps should not use @samp{^} as
334an anchor, to ensure that the paragraph functions will work equally
335within a region of text indented by a margin setting.
336
327@node Pages 337@node Pages
328@section Pages 338@section Pages
329 339
@@ -479,8 +489,8 @@ text.
479@cindex mode, Auto Fill 489@cindex mode, Auto Fill
480 490
481 @dfn{Auto Fill} mode is a buffer-local minor mode (@pxref{Minor 491 @dfn{Auto Fill} mode is a buffer-local minor mode (@pxref{Minor
482Modes}) in which lines are broken automatically when they become too 492Modes}) in which lines are broken automatically at spaces when the
483wide. Breaking happens only when you type a @key{SPC} or @key{RET}. 493line becomes too wide.
484 494
485@table @kbd 495@table @kbd
486@item M-x auto-fill-mode 496@item M-x auto-fill-mode
@@ -492,14 +502,12 @@ In Auto Fill mode, break lines when appropriate.
492 502
493@findex auto-fill-mode 503@findex auto-fill-mode
494 The mode command @kbd{M-x auto-fill-mode} toggles Auto Fill mode in 504 The mode command @kbd{M-x auto-fill-mode} toggles Auto Fill mode in
495the current buffer. With a positive numeric argument, it enables Auto 505the current buffer. Like any other minor mode, with a positive
496Fill mode, and with a negative argument it disables it. If 506numeric argument, it enables Auto Fill mode, and with a negative
497@code{auto-fill-mode} is called from Lisp with an omitted or 507argument it disables it. To enable Auto Fill mode automatically in
498@code{nil} argument, it enables Auto Fill mode. To enable Auto Fill 508certain major modes, add @code{auto-fill-mode} to the mode hooks
499mode automatically in certain major modes, add @code{auto-fill-mode} 509(@pxref{Major Modes}). When Auto Fill mode is enabled, the mode
500to the mode hooks (@pxref{Major Modes}). When Auto Fill mode is 510indicator @samp{Fill} appears in the mode line (@pxref{Mode Line}).
501enabled, the mode indicator @samp{Fill} appears in the mode line
502(@pxref{Mode Line}).
503 511
504 Auto Fill mode breaks lines automatically at spaces whenever they 512 Auto Fill mode breaks lines automatically at spaces whenever they
505get longer than the desired width. This line breaking occurs only 513get longer than the desired width. This line breaking occurs only