aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-08-17 16:04:31 +0800
committerXue Fuqiao2013-08-17 16:04:31 +0800
commitd311017740d3a8757c3fa5a35f52b0aeb25f10ca (patch)
tree27867bda14b73500cd0dac8ceeab016328159351
parentc9b39934d655610072cd42e39a46f6332e97dc41 (diff)
downloademacs-d311017740d3a8757c3fa5a35f52b0aeb25f10ca.tar.gz
emacs-d311017740d3a8757c3fa5a35f52b0aeb25f10ca.zip
* doc/emacs/text.texi (Sorting): Fix indentation.
-rw-r--r--doc/emacs/glossary.texi1
-rw-r--r--doc/lispref/ChangeLog1
-rw-r--r--doc/lispref/text.texi9
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 43441c20814..e4693a5293f 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -873,6 +873,7 @@ The Emacs major modes are a mutually exclusive set of options, each of
873which configures Emacs for editing a certain sort of text. Ideally, 873which configures Emacs for editing a certain sort of text. Ideally,
874each programming language has its own major mode. @xref{Major Modes}. 874each programming language has its own major mode. @xref{Major Modes}.
875 875
876@c FIXME: Mention margins for filling?
876@item Margin 877@item Margin
877The space between the usable part of a window (including the 878The space between the usable part of a window (including the
878fringe) and the window edge. 879fringe) and the window edge.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 12eec54ef53..4143c2ae76b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -3,6 +3,7 @@
3 * text.texi (Maintaining Undo): Mention interactive call of 3 * text.texi (Maintaining Undo): Mention interactive call of
4 buffer-disable-undo. 4 buffer-disable-undo.
5 (Filling): Add cross-reference for hard newlines. 5 (Filling): Add cross-reference for hard newlines.
6 (Sorting): Fix indentation.
6 7
72013-08-16 Xue Fuqiao <xfq.free@gmail.com> 82013-08-16 Xue Fuqiao <xfq.free@gmail.com>
8 9
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index babb5b71b8f..83035cb792d 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1809,6 +1809,7 @@ prefix or @code{nil}, meaning it has failed to determine a prefix.
1809@cindex filling, automatic 1809@cindex filling, automatic
1810@cindex Auto Fill mode 1810@cindex Auto Fill mode
1811 1811
1812@c FIXME: I don't think any of the variables below is a/an normal/abnormal hook.
1812 Auto Fill mode is a minor mode that fills lines automatically as text 1813 Auto Fill mode is a minor mode that fills lines automatically as text
1813is inserted. This section describes the hook used by Auto Fill mode. 1814is inserted. This section describes the hook used by Auto Fill mode.
1814For a description of functions that you can call explicitly to fill and 1815For a description of functions that you can call explicitly to fill and
@@ -1950,10 +1951,10 @@ its @code{sort-subr} call looks like this:
1950@group 1951@group
1951(sort-subr reverse 1952(sort-subr reverse
1952 (function 1953 (function
1953 (lambda () 1954 (lambda ()
1954 (while (and (not (eobp)) 1955 (while (and (not (eobp))
1955 (looking-at paragraph-separate)) 1956 (looking-at paragraph-separate))
1956 (forward-line 1)))) 1957 (forward-line 1))))
1957 'forward-paragraph) 1958 'forward-paragraph)
1958@end group 1959@end group
1959@end example 1960@end example