merge from trunk

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
 which configures Emacs for editing a certain sort of text.  Ideally,
 each programming language has its own major mode.  @xref{Major Modes}.
 
+@c FIXME: Mention margins for filling?
 @item Margin
 The space between the usable part of a window (including the
 fringe) 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 @@
         * text.texi (Maintaining Undo): Mention interactive call of
         buffer-disable-undo.
         (Filling): Add cross-reference for hard newlines.
+        (Sorting): Fix indentation.
 
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
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.
 @cindex filling, automatic
 @cindex Auto Fill mode
 
+@c FIXME: I don't think any of the variables below is a/an normal/abnormal hook.
   Auto Fill mode is a minor mode that fills lines automatically as text
 is inserted.  This section describes the hook used by Auto Fill mode.
 For a description of functions that you can call explicitly to fill and
@@ -1950,10 +1951,10 @@ its @code{sort-subr} call looks like this:
 @group
 (sort-subr reverse
            (function
-             (lambda ()
-               (while (and (not (eobp))
-                      (looking-at paragraph-separate))
-                 (forward-line 1))))
+            (lambda ()
+              (while (and (not (eobp))
+                          (looking-at paragraph-separate))
+                (forward-line 1))))
            'forward-paragraph)
 @end group
 @end example