Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl.web@gmail.com

8 files changed, 39 insertions, 27 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ccf8c4df40e..9f9717aab29 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-10  Chong Yidong  <cyd@gnu.org>
+
+        * sc.texi: Remove bogus @ifinfo commands which prevent makeinfo
+        compilation for html-mono.
+
 2012-06-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         * texinfo.tex: Merge from gnulib.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 51d12fef806..6be385aeba9 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -95,13 +95,11 @@ of composing replies to both USENET network news and electronic mail.
 The preferred way to spell Supercite is with a capital @samp{S},
 lowercase @samp{upercite}.
 
-@ifinfo
 @menu
 * Usage Overview::
 * What Supercite Does Not Do::
 * What Supercite Does::
 @end menu
-@end ifinfo
 
 @cindex MUA
 @cindex NUA
@@ -242,12 +240,10 @@ citations after multiple replies:
 And that's what I think too.
 @end example
 
-@ifinfo
 @menu
 * Citation Elements::
 * Recognizing Citations::
 @end menu
-@end ifinfo
 
 Note that multiple inclusions of the original messages result in a
 nesting of the @samp{@code{>}} characters.  This can sometimes be quite
@@ -506,12 +502,10 @@ name, email address, the original article's subject, etc.  In fact any
 information contained in the info alist can be inserted into a reference
 header.
 
-@ifinfo
 @menu
 * The Built-in Header Rewrite Functions::
 * Electric References::
 @end menu
-@end ifinfo
 
 @cindex header rewrite functions
 @vindex sc-rewrite-header-list
@@ -791,7 +785,6 @@ Buffer Initialization}.@refill
 
 @node  Replying and Yanking
 @chapter Replying and Yanking
-@ifinfo
 
 This chapter explains what happens when you reply and yank an original
 message from an MUA.
@@ -800,7 +793,7 @@ message from an MUA.
 * Reply Buffer Initialization::
 * Filling Cited Text::
 @end menu
-@end ifinfo
+
 @node  Reply Buffer Initialization
 @section Reply Buffer Initialization
 @findex sc-cite-original
@@ -1053,13 +1046,11 @@ element in the attribution alist is a key-value pair containing such
 information as the author's first name, middle names, and last name, the
 author's initials, and the author's email terminus.
 
-@ifinfo
 @menu
 * Attribution Preferences::
 * Anonymous Attributions::
 * Author Names::
 @end menu
-@end ifinfo
 
 @node  Attribution Preferences
 @section Attribution Preferences
@@ -1331,12 +1322,10 @@ can be transformed in an @emph{awk}-like manner.  Regi is used
 throughout Supercite, from mail header information extraction, to header
 nuking, to citing text.
 
-@ifinfo
 @menu
 * Using Regi::
 * Frames You Can Customize::
 @end menu
-@end ifinfo
 
 While the details of Regi are discussed below (@pxref{Using Regi}), only
 those who wish to customize certain aspects of Supercite need concern
@@ -1534,7 +1523,6 @@ but unfortunately the best general solution so far.  In the rest of this
 chapter, we'll assume you've installed Supercite's keymap on the default
 prefix.@refill
 
-@ifinfo
 @menu
 * Citing Commands::
 * Insertion Commands::
@@ -1542,7 +1530,6 @@ prefix.@refill
 * Mail Field Commands::
 * Miscellaneous Commands::
 @end menu
-@end ifinfo
 
 @node   Citing Commands
 @section Commands to Manually Cite, Recite, and Uncite
@@ -1909,9 +1896,7 @@ Supercite was written by Barry Warsaw.
 
 @node  Command Index
 @unnumbered Command Index
-@ifinfo
 
-@end ifinfo
 Since all supercite commands are prepended with the string
 ``@code{sc-}'', each appears under its @code{sc-}@var{command} name and
 its @var{command} name.
@@ -1926,9 +1911,7 @@ its @var{command} name.
 
 @node Variable Index
 @unnumbered Variable Index
-@ifinfo
 
-@end ifinfo
 Since all supercite variables are prepended with the string
 ``@code{sc-}'', each appears under its @code{sc-}@var{variable} name and
 its @var{variable} name.
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 1cf3a523596..e6e8137141e 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -1134,8 +1134,8 @@ Eric Schulte: wrote ob-C.el ob-asymptote.el ob-awk.el ob-calc.el
 and co-wrote ob-R.el ob-clojure.el ob-exp.el ob-fortran.el ob-lisp.el
   ob-lob.el ob-maxima.el ob-perl.el ob-picolisp.el ob-python.el ob-ref.el
   ob.el org-bibtex.el
-and changed org.texi org.el org-exp.el org-latex.el org-src.el
-  ob-plantuml.el org-table.el org-agenda.el org-macs.el orgcard.tex
+and changed org.texi org.el org-exp.el org-latex.el ob-plantuml.el
+  org-src.el org-table.el org-agenda.el org-macs.el orgcard.tex
   ob-lilypond.el ob-mscgen.el ob-octave.el ob-screen.el org-ascii.el
   org-footnote.el org-html.el org-mouse.el gnus-art.el ob-ledger.el
   ob-matlab.el and 5 other files
@@ -2035,8 +2035,8 @@ Keith Gabryelski: wrote hexl.c hexl.el
 Keith Packard: changed font.c
 
 Ken Brown: changed configure.in cygwin.h sheap.c browse-url.el gmalloc.c
-  vm-limit.c dired.c emacs.c fileio.c gdb-mi.el loadup.el mem-limits.h
-  unexcw.c
+  vm-limit.c callproc.c dired.c emacs.c fileio.c gdb-mi.el loadup.el
+  mem-limits.h unexcw.c
 
 Ken Brush: changed emacsclient.c
 
@@ -2373,6 +2373,8 @@ Mark Osbourne: changed hexl-mode.el
 
 Mark Plaksin: changed nnrss.el term.el
 
+Mark Shoulson: changed org.el
+
 Mark Thomas: changed flow-fill.el gnus-sum.el gnus-util.el nnmail.el
 
 Mark Triggs: changed nnir.el
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c83b4453922..c159d04443a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2012-06-10  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-yank-current-message): Leave point at
+        correct position.  (Bug#11660)
+
+2012-06-10  Chong Yidong  <cyd@gnu.org>
+
+        * allout-widgets.el: Fix code header.
+
+2012-06-10  Chong Yidong  <cyd@gnu.org>
+
+        * cus-edit.el (customize-changed-options-previous-release): Bump
+        to 24.1.
+
 2012-06-09  Andreas Schwab  <schwab@linux-m68k.org>
 
         * Makefile.in (BIG_STACK_DEPTH): Enlarge to 2200.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 6a5b0d5f7bf..962a8fb557a 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -64,7 +64,7 @@
 ;; systematically couple overlays, graphics, and other features with
 ;; allout-governed text.
 
-;;;_: Code (structured with comments that delineate an allout outline)
+;;; Code:
 
 ;;;_ : General Environment
 (require 'allout)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b220e7a5ff2..0ee2ea4a8bf 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1159,7 +1159,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "23.1"
+(defvar customize-changed-options-previous-release "24.1"
   "Version for `customize-changed-options' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index cd2a961638e..9fe8f28a59f 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3589,7 +3589,7 @@ If BUFFER is not swapped, yank out of its message viewer buffer."
   (with-current-buffer buffer
     (unless (rmail-buffers-swapped-p)
       (setq buffer rmail-view-buffer)))
-  (insert-buffer buffer)
+  (insert-buffer-substring buffer)
   ;; If they yank the text of BUFFER, the encoding of BUFFER is a
   ;; better default for the reply message than the default value of
   ;; buffer-file-coding-system.
diff --git a/src/dispextern.h b/src/dispextern.h
index b877bf9965a..6e070f3dbef 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2205,7 +2205,11 @@ struct it
   struct display_pos current;
 
   /* Total number of overlay strings to process.  This can be >
-     OVERLAY_STRING_CHUNK_SIZE.  */
+     OVERLAY_STRING_CHUNK_SIZE.  Value is dependable only when
+     current.overlay_string_index >= 0.  Use the latter to determine
+     whether an overlay string is being iterated over, because
+     n_overlay_strings can be positive even when we are not rendering
+     an overlay string.  */
   ptrdiff_t n_overlay_strings;
 
   /* The charpos where n_overlay_strings was calculated.  This should
@@ -2224,7 +2228,8 @@ struct it
 
   /* If non-nil, a Lisp string being processed.  If
      current.overlay_string_index >= 0, this is an overlay string from
-     pos.  */
+     pos.  Use STRINGP (it.string) to test whether we are rendering a
+     string or something else; do NOT use BUFFERP (it.object).  */
   Lisp_Object string;
 
   /* If non-nil, we are processing a string that came
@@ -2413,6 +2418,9 @@ struct it
      and continuation glyphs, or blanks that extend each line to the
      edge of the window on a TTY.
 
+     Do NOT use !BUFFERP (it.object) as a test whether we are
+     iterating over a string; use STRINGP (it.string) instead.
+
      Position is the current iterator position in object.  */
   Lisp_Object object;
   struct text_pos position;