[Emacs-diffs] /srv/bzr/emacs/trunk r111430: Merge from emacs-24; up to r111146

[Glenn Morris]

------------------------------------------------------------
revno: 111430 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-06 12:34:54 -0800
message:
  Merge from emacs-24; up to r111146
modified:
  doc/lispref/ChangeLog
  doc/lispref/windows.texi
  doc/misc/ChangeLog
  doc/misc/autotype.texi
  doc/misc/cc-mode.texi
  doc/misc/org.texi
  doc/misc/pgg.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-01-05 21:18:01 +0000
+++ b/doc/lispref/ChangeLog     2013-01-06 20:34:54 +0000
@@ -1,3 +1,7 @@
+2013-01-06  Chong Yidong  <address@hidden>
+
+       * windows.texi (Vertical Scrolling): Fix typos (Bug#13267).
+
 2013-01-05  Glenn Morris  <address@hidden>
 
        * display.texi (Overlay Properties): Mention field.  (Bug#13364)

=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi  2013-01-02 16:13:04 +0000
+++ b/doc/lispref/windows.texi  2013-01-06 20:34:54 +0000
@@ -3054,10 +3054,11 @@
 @end defun
 
 @defvar auto-window-vscroll
-If this variable is address@hidden, 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 address@hidden, the @code{line-move},
address@hidden, 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

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-01-05 21:18:01 +0000
+++ b/doc/misc/ChangeLog        2013-01-06 20:34:54 +0000
@@ -1,3 +1,13 @@
+2013-01-06  Andreas Schwab  <address@hidden>
+
+       * autotype.texi: Remove undefined command @subtitlefont.
+       * cc-mode.texi: Likewise.
+
+       * org.texi (Advanced features): Use address@hidden }' instead of `@ ' in
+       @item argument.
+       (Property searches): Use \\ instead of @backslashchar{}.
+       * pgg.texi (VERSION): Move @set below @setfilename.
+
 2013-01-05  Andreas Schwab  <address@hidden>
 
        * ada-mode.texi: Remove braces from @title argument.

=== modified file 'doc/misc/autotype.texi'
--- a/doc/misc/autotype.texi    2013-01-01 09:11:05 +0000
+++ b/doc/misc/autotype.texi    2013-01-06 14:29:40 +0000
@@ -37,8 +37,7 @@
 
 @center @titlefont{Autotyping}
 @sp 2
address@hidden @subtitlefont{Convenient features for text that you enter
-frequently in Emacs}
address@hidden Convenient features for text that you enter frequently in Emacs
 @sp 2
 @center Daniel Pfeiffer
 @center additions by Dave Love

=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi     2013-01-01 09:11:05 +0000
+++ b/doc/misc/cc-mode.texi     2013-01-06 14:29:40 +0000
@@ -188,7 +188,7 @@
 
 @center @titlefont{CC Mode 5.32}
 @sp 2
address@hidden @subtitlefont{A GNU Emacs mode for editing C and C-like 
languages}
address@hidden A GNU Emacs mode for editing C and C-like languages
 @sp 2
 @center Barry A. Warsaw, Martin Stjernholm, Alan Mackenzie
 

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2013-01-05 21:18:01 +0000
+++ b/doc/misc/org.texi 2013-01-06 20:34:54 +0000
@@ -3027,7 +3027,7 @@
 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.
address@hidden @
address@hidden @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 @@
 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
address@hidden / m,C-c @backslashchar{},org-match-sparse-tree}
address@hidden / 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}

=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2013-01-05 16:19:53 +0000
+++ b/doc/misc/pgg.texi 2013-01-06 10:34:26 +0000
@@ -2,9 +2,9 @@
 
 @include gnus-overrides.texi
 
address@hidden ../../info/pgg
+
 @set VERSION 0.1
-
address@hidden ../../info/pgg
 @settitle PGG @value{VERSION}
 
 @copying