Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org

7 files changed, 25 insertions, 11 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 31c81e62ac1..64973ca38c5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Vertical Scrolling): Fix typos (Bug#13267).
+
 2013-01-05  Glenn Morris  <rgm@gnu.org>
 
         * display.texi (Overlay Properties): Mention field.  (Bug#13364)
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b3c143496dd..792002add81 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3054,10 +3054,11 @@ pixels.  In this case, the return value is @var{lines}.
 @end defun
 
 @defvar auto-window-vscroll
-If this variable is non-@code{nil}, the line-move, scroll-up, and
-scroll-down functions will automatically modify the vertical scroll
-position to scroll through display rows that are taller than the height
-of the window, for example in the presence of large images.
+If this variable is non-@code{nil}, the @code{line-move},
+@code{scroll-up}, and @code{scroll-down} functions will automatically
+modify the vertical scroll position to scroll through display rows
+that are taller than the height of the window, for example in the
+presence of large images.
 @end defvar
 
 @node Horizontal Scrolling
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d756f4fd0f0..79214acc102 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * autotype.texi: Remove undefined command @subtitlefont.
+        * cc-mode.texi: Likewise.
+
+        * org.texi (Advanced features): Use `@w{ }' instead of `@ ' in
+        @item argument.
+        (Property searches): Use \\ instead of @backslashchar{}.
+        * pgg.texi (VERSION): Move @set below @setfilename.
+
 2013-01-05  Andreas Schwab  <schwab@linux-m68k.org>
 
         * ada-mode.texi: Remove braces from @title argument.
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index ad6a2902b1e..137ed6b43e8 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -37,8 +37,7 @@ modify this GNU manual.''
 
 @center @titlefont{Autotyping}
 @sp 2
-@center @subtitlefont{Convenient features for text that you enter
-frequently in Emacs}
+@center Convenient features for text that you enter frequently in Emacs
 @sp 2
 @center Daniel Pfeiffer
 @center additions by Dave Love
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index f63c6c54a16..55b7028101a 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -188,7 +188,7 @@ modify this GNU manual.''
 
 @center @titlefont{CC Mode 5.32}
 @sp 2
-@center @subtitlefont{A GNU Emacs mode for editing C and C-like languages}
+@center A GNU Emacs mode for editing C and C-like languages
 @sp 2
 @center Barry A. Warsaw, Martin Stjernholm, Alan Mackenzie
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index bea130ccb43..47ee0954671 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3027,7 +3027,7 @@ lines will be left alone by this command.
 Selects this line for global recalculation with @kbd{C-u C-c *}, but
 not for automatic recalculation.  Use this when automatic
 recalculation slows down editing too much.
-@item @
+@item @w{ }
 Unmarked lines are exempt from recalculation with @kbd{C-u C-c *}.
 All lines that should be recalculated should be marked with @samp{#}
 or @samp{*}.
@@ -5050,7 +5050,7 @@ FILE         @r{The filename the entry is located in.}
 To create sparse trees and special lists with selection based on properties,
 the same commands are used as for tag searches (@pxref{Tag searches}).
 @table @kbd
-@orgcmdkkc{C-c / m,C-c @backslashchar{},org-match-sparse-tree}
+@orgcmdkkc{C-c / m,C-c \\,org-match-sparse-tree}
 Create a sparse tree with all matching entries.  With a
 @kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
 @orgcmd{C-c a m,org-tags-view}
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index bb40a9f541d..a18a22e649f 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -2,9 +2,9 @@
 
 @include gnus-overrides.texi
 
-@set VERSION 0.1
-
 @setfilename ../../info/pgg
+
+@set VERSION 0.1
 @settitle PGG @value{VERSION}
 
 @copying