Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org

8 files changed, 32 insertions, 21 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 77f47cdaae4..2d1134c6a89 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,24 @@
+2012-05-05  Glenn Morris  <rgm@gnu.org>
+
+        * objects.texi (Process Type, Overlay Type): Tweak page-breaks.
+
+        * intro.texi (Caveats): Copyedit.
+        (Lisp History): Convert inforef to xref.
+        (Lisp History, Printing Notation, Version Info): Improve page-breaks.
+
+        * text.texi (Auto Filling): Don't mention Emacs 19.
+
+        * commands.texi (Event Input Misc): Don't mention unread-command-char.
+        * numbers.texi (Predicates on Numbers): Don't mention Emacs 18.
+
+        * elisp.texi (DATE): Forgot to change the month in 2012-04-21 change.
+
+2012-05-04  Glenn Morris  <rgm@gnu.org>
+
+        * lists.texi (List-related Predicates, List Variables):
+        Tweak page-breaks.
+        (Sets And Lists): Convert inforef to xref.
+
 2012-05-04  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index dea838462bb..50c345b5b15 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2703,6 +2703,7 @@ This function converts the string or vector @var{key} to a list of
 individual events, which you can put in @code{unread-command-events}.
 @end defun
 
+@ignore
 @defvar unread-command-char
 This variable holds a character to be read as command input.
 A value of -1 means ``empty''.
@@ -2711,6 +2712,7 @@ This variable is mostly obsolete now that you can use
 @code{unread-command-events} instead; it exists only to support programs
 written for Emacs versions 18 and earlier.
 @end defvar
+@end ignore
 
 @defun input-pending-p
 @cindex waiting for command key input
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index cbec93c4f6c..5e0356ff1ff 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -9,7 +9,7 @@
 @c (See comments for EDITION in emacs.texi)
 @set VERSION  3.1
 @include emacsver.texi
-@set DATE July 2012
+@set DATE May 2012
 
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  The manual should go
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 698bc8c125b..282d01c3504 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -73,7 +73,7 @@ real-life example for a function or group of functions, please make an
 effort to write it up and send it in.  Please reference any comments to
 the chapter name, section name, and function name, as appropriate, since
 page numbers and chapter and section numbers will change and we may have
-trouble finding the text you are talking about.  Also state the number
+trouble finding the text you are talking about.  Also state the version
 of the edition you are criticizing.
 @end iftex
 @ifnottex
@@ -120,10 +120,10 @@ worry about it; this manual is self-contained.
 
 @pindex cl
   A certain amount of Common Lisp emulation is available via the
-@file{cl} library.  @inforef{Top, Overview, cl}.
+@file{cl} library.  @xref{Top,, Overview, cl, Common Lisp Extensions}.
 
   Emacs Lisp is not at all influenced by Scheme; but the GNU project has
-an implementation of Scheme, called Guile.  We use Guile in all new GNU
+an implementation of Scheme, called Guile.  We use it in all new GNU
 software that calls for extensibility.
 
 @node Conventions
@@ -257,7 +257,7 @@ displayed in the echo area.
 
   Examples in this manual indicate printed text with @samp{@print{}},
 irrespective of where that text goes.  The value returned by
-evaluating the form (here @code{bar}) follows on a separate line with
+evaluating the form follows on a separate line with
 @samp{@result{}}.
 
 @example
@@ -510,8 +510,6 @@ numeric components, such as @code{"22.0.91.1"}, indicates an
 unreleased test version.
 @end defvar
 
-  The following two variables have existed since Emacs version 19.23:
-
 @defvar emacs-major-version
 The major version number of Emacs, as an integer.  For Emacs version
 23.1, the value is 23.
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 423bc7b6d8a..82a796c6700 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -87,7 +87,7 @@ structure made out of cons cells as a @dfn{list structure}.
 whether it is a cons cell or is a list, or whether it is the
 distinguished object @code{nil}.  (Many of these predicates can be
 defined in terms of the others, but they are used so often that it is
-worth having all of them.)
+worth having them.)
 
 @defun consp object
 This function returns @code{t} if @var{object} is a cons cell, @code{nil}
@@ -763,8 +763,7 @@ if it already has one; otherwise, it is equivalent to @code{nil}.
 
 The argument @var{symbol} is not implicitly quoted;
 @code{add-to-ordered-list} is an ordinary function, like @code{set}
-and unlike @code{setq}.  Quote the argument yourself if that is what
-you want.
+and unlike @code{setq}.  Quote the argument yourself if necessary.
 
 The ordering information is stored in a hash table on @var{symbol}'s
 @code{list-order} property.
@@ -1269,7 +1268,7 @@ functions for sets include @code{memq} and @code{delq}, and their
 @b{Common Lisp note:} Common Lisp has functions @code{union} (which
 avoids duplicate elements) and @code{intersection} for set operations.
 Although standard GNU Emacs Lisp does not have them, the @file{cl}
-library provides versions.  @inforef{Top, Overview, cl}.
+library provides versions.  @xref{Top,, Overview, cl, Common Lisp Extensions}.
 @end quotation
 
 @defun memq object list
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 02d306b3f75..f19dea69036 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -267,8 +267,6 @@ its argument.  See also @code{integer-or-marker-p} and
 @defun floatp object
 This predicate tests whether its argument is a floating point
 number and returns @code{t} if so, @code{nil} otherwise.
-
-@code{floatp} does not exist in Emacs versions 18 and earlier.
 @end defun
 
 @defun integerp object
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index b49d2bc05fe..f43b8d803f5 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1567,7 +1567,6 @@ runs in a process of this sort.  However, in Emacs Lisp, a process is a
 Lisp object that designates a subprocess created by the Emacs process.
 Programs such as shells, GDB, ftp, and compilers, running in
 subprocesses of Emacs, extend the capabilities of Emacs.
-
   An Emacs subprocess takes textual input from Emacs and returns textual
 output to Emacs for further manipulation.  Emacs can also send signals
 to the subprocess.
@@ -1631,7 +1630,7 @@ buffer temporarily in a different display style.  Overlays have no read
 syntax, and print in hash notation, giving the buffer name and range of
 positions.
 
-  @xref{Overlays}, for how to create and use overlays.
+  @xref{Overlays}, for information on how you can create and use overlays.
 
 @node Font Type
 @subsection Font Type
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 1178c294892..09ea37a96ba 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1799,12 +1799,6 @@ special is done in that case.
 The value of @code{auto-fill-function} is @code{do-auto-fill} when
 Auto-Fill mode is enabled.  That is a function whose sole purpose is to
 implement the usual strategy for breaking a line.
-
-@quotation
-In older Emacs versions, this variable was named @code{auto-fill-hook},
-but since it is not called with the standard convention for hooks, it
-was renamed to @code{auto-fill-function} in version 19.
-@end quotation
 @end defvar
 
 @defvar normal-auto-fill-function