updates for version 19.29 made by melissa; also needed to check out files

so two-volume formatting could be accomplished.

12 files changed, 48 insertions, 10 deletions

diff --git a/lispref/commands.texi b/lispref/commands.texi
index c03e9169ad6..a8bfe36eb3f 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -1276,7 +1276,7 @@ The standard definition of the @code{delete-frame} event is to delete @var{frame
 @item (iconify-frame (@var{frame}))
 This kind of event indicates that the user iconified @var{frame} using
 the window manager.  Its standard definition is @code{ignore}; since
-the frame has already been iconified, Emacs has no work to do.
+the frame has already been deiconified, Emacs has no work to do.
 The purpose of this event type is so that you can keep track of such
 events if you want to.
 
diff --git a/lispref/intro.texi b/lispref/intro.texi
index b671c89c8f1..def0d1c84bc 100644
--- a/lispref/intro.texi
+++ b/lispref/intro.texi
@@ -11,7 +11,7 @@
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+675 Mass Ave, Cambridge, MA 02139, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -357,7 +357,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
@@ -425,7 +425,7 @@ describe features of Emacs Lisp that have counterparts in many
 programming languages, and later chapters describe features that are
 peculiar to Emacs Lisp or relate specifically to editing.
 
-  This is edition 2.3.
+  This is edition 2.4.
 
 @menu
 * Caveats::             Flaws and a request for help.
diff --git a/lispref/lists.texi b/lispref/lists.texi
index 6bb33b80126..e1b2bcbb2fd 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -756,6 +756,7 @@ x1
 @end group
 @end example
 
+@need 4000
   Here is the result in box notation:
 
 @example
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 2694dc44a19..4aec67475d6 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -157,11 +157,13 @@ Here is an example of code you can place in a @file{.emacs} file to add
 several directories to the front of your default @code{load-path}:
 
 @smallexample
+@group
 (setq load-path
       (append (list nil "/user/bil/emacs"
                     "/usr/local/lisplib"
                     (expand-file-name "~/emacs"))
               load-path))
+@end group
 @end smallexample
 
 @c Wordy to rid us of an overfull hbox.  --rjc 15mar92
@@ -251,6 +253,13 @@ Specify @var{type} as @code{keymap} if @var{function} is really a
 keymap.  Various parts of Emacs need to know this information without
 loading the real definition.
 
+An autoloaded keymap loads automatically during key lookup when a prefix
+key's binding is the symbol @var{function}.  Autoloading does not occur
+for other kinds of access to the keymap.  In particular, it does not
+happen when a Lisp program gets the keymap from the value of a variable
+and calls @code{define-key}; not even if the variable name is the same
+symbol @var{function}.
+
 @cindex function cell in autoload
 If @var{function} already has a non-void function definition that is not
 an autoload object, @code{autoload} does nothing and returns @code{nil}.
@@ -264,8 +273,10 @@ object, then it is defined as an autoload object like this:
 For example, 
 
 @example
+@group
 (symbol-function 'run-prolog)
      @result{} (autoload "prolog" 169681 t nil)
+@end group
 @end example
 
 @noindent
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index 7b6ef868142..e2077955df5 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -478,8 +478,10 @@ If you divide by 0, an @code{arith-error} error is signaled.
 (@xref{Errors}.)
 
 @example
+@group
 (/ 6 2)
      @result{} 3
+@end group
 (/ 5 2)
      @result{} 2
 (/ 25 3 2)
@@ -541,16 +543,26 @@ quotient to compute the remainder.
 An @code{arith-error} results if @var{divisor} is 0.
 
 @example
+@group
 (mod 9 4)
      @result{} 1
+@end group
+@group
 (mod -9 4)
      @result{} 3
+@end group
+@group
 (mod 9 -4)
      @result{} -3
+@end group
+@group
 (mod -9 -4)
      @result{} -1
+@end group
+@group
 (mod 5.5 2.5)
      @result{} .5
+@end group
 @end example
 
 For any two numbers @var{dividend} and @var{divisor},
diff --git a/lispref/objects.texi b/lispref/objects.texi
index 4952f07514e..dd7a7bb77fe 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -1311,6 +1311,7 @@ a list and @code{symbolp} to check for a symbol.
         ((listp x)
          ;; If X is a list, add its elements to LIST.
          (setq list (append x list)))
+@need 3000
         (t
          ;; We only handle symbols and lists.
          (error "Invalid argument %s in add-on" x))))
diff --git a/lispref/os.texi b/lispref/os.texi
index a21107bf4fe..0dbb243d7e6 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1027,7 +1027,7 @@ items of calendrical data into a time value.  For the meanings of the
 arguments, see the table above under @code{decode-time}.
 
 Year numbers less than 100 are treated just like other year numbers.  If
-you them to stand for years above 1900, you must alter them yourself
+you want them to stand for years above 1900, you must alter them yourself
 before you call @code{encode-time}.
 
 The optional argument @var{zone} defaults to the current time zone and
@@ -1321,6 +1321,7 @@ the event that follows.  For example, here's how to define @kbd{C-c h}
 to turn the character that follows into a Hyper character:
 
 @example
+@group
 (defun hyperify (prompt)
   (let ((e (read-event)))
     (vector (if (numberp e)
@@ -1333,11 +1334,14 @@ to turn the character that follows into a Hyper character:
   (let ((symbol (if (symbolp e) e (car e))))
     (setq symbol (intern (concat string
                                  (symbol-name symbol))))
+@end group
+@group
     (if (symbolp e)
         symbol
       (cons symbol (cdr e)))))
 
 (define-key function-key-map "\C-ch" 'hyperify)
+@end group
 @end example
 
 @pindex iso-transl
diff --git a/lispref/searching.texi b/lispref/searching.texi
index 40cc3eb6cbd..073c1ae212a 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -850,9 +850,9 @@ The argument @var{replacements} specifies what to replace occurrences
 with.  If it is a string, that string is used.  It can also be a list of
 strings, to be used in cyclic order.
 
-If @var{repeat-count} is non-@code{nil}, it should be an integer, the
-number of occurrences to consider.  In this case, @code{perform-replace}
-returns after considering that many occurrences.
+If @var{repeat-count} is non-@code{nil}, it should be an integer.  Then
+it specifies how many times to use each of the strings in the
+@var{replacements} list before advancing cyclicly to the next one.
 
 Normally, the keymap @code{query-replace-map} defines the possible user
 responses for queries.  The argument @var{map}, if non-@code{nil}, is a
diff --git a/lispref/strings.texi b/lispref/strings.texi
index d923d0407cd..f53c1c305eb 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -251,6 +251,7 @@ description of @code{mapconcat} in @ref{Mapping Functions},
 Lists}.
 @end defun
 
+@need 2000
 @node Text Comparison
 @section Comparison of Characters and Strings
 @cindex string equality
diff --git a/lispref/symbols.texi b/lispref/symbols.texi
index cbe1deea747..9c20df9c4ae 100644
--- a/lispref/symbols.texi
+++ b/lispref/symbols.texi
@@ -311,12 +311,18 @@ value of the global variable @code{obarray} is used.
      @result{} nil
 (make-symbol "frazzle")        ; @r{Create an uninterned one.}
      @result{} frazzle
+@group
 (intern-soft "frazzle")        ; @r{That one cannot be found.}
      @result{} nil
+@end group
+@group
 (setq sym (intern "frazzle"))  ; @r{Create an interned one.}
      @result{} frazzle
+@end group
+@group
 (intern-soft "frazzle")        ; @r{That one can be found!}
      @result{} frazzle
+@end group
 @group
 (eq sym 'frazzle)              ; @r{And it is the same one.}
      @result{} t
diff --git a/lispref/text.texi b/lispref/text.texi
index b4547224308..6b165e18287 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1089,7 +1089,7 @@ change group at which this size is exceeded is the last one kept.
 This is the upper limit for the acceptable size of an undo list.  The
 change group at which this size is exceeded is discarded itself (along
 with all older change groups).  There is one exception: the very latest
-change group is never discarded separate no matter how big it is.
+change group is never discarded no matter how big it is.
 @end defvar
 
 @node Filling
@@ -1335,7 +1335,7 @@ becomes buffer-local when set in any fashion.
 @cindex Auto Fill mode
 
   Auto Fill mode is a minor mode that fills lines automatically as text
-as inserted.  This section describes the hook used by Auto Fill mode.
+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
 justify existing text, see @ref{Filling}.
 
diff --git a/lispref/windows.texi b/lispref/windows.texi
index fb73cd865fd..27925e9be8c 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -224,6 +224,7 @@ Next, the top window is split horizontally:
 @end group
 @end smallexample
 
+@need 3000
 Now, the screen looks like this:
 
 @smallexample
@@ -1611,6 +1612,7 @@ If you omit @var{frame}, the selected frame is used.
 This function checks whether a particular frame position falls within
 the window @var{window}.
 
+@need 3000
 The argument @var{coordinates} is a cons cell of this form:
 
 @example