New directory

author: Kenichi Handa 2003-09-08 11:56:09 +0000
committer: Kenichi Handa 2003-09-08 11:56:09 +0000
commit: 463f5630a5e7cbe7f042bc1175d1fa1c4e98860f (patch)
tree: 3287d0c628fea2249abf4635b3a4f45bedd6f8c4 /lispref
parent: 4256310de631bd57c78b88b5131caa073315b3d7 (diff)
download: emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.tar.gz
emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.zip
67 files changed, 163 insertions, 1632 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 8258aff458e..de5c4332e5f 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,116 +1,3 @@
-2003-09-03  Peter Runestig  <peter@runestig.com>
-        * makefile.w32-in: New file.
-2003-08-29  Richard M. Stallman  <rms@gnu.org>
-        * display.texi (Overlay Properties): Clarify how priorities
-        affect use of the properties.
-2003-08-19  Luc Teirlinck  <teirllm@mail.auburn.edu>
-        * customize.texi (Type Keywords): Correct the description of
-        `:help-echo' in the case where `motion-doc' is a function.
-2003-08-14  John Paul Wallington  <jpw@gnu.org>
-        * modes.texi (Emulating Mode Line): Subsection, not section.
-2003-08-13  Richard M. Stallman  <rms@gnu.org>
-        * elisp.texi (Top): Update subnode lists in menu.
-        * text.texi (Insertion): Add insert-buffer-substring-no-properties.
-        (Kill Functions): kill-region has new arg yank-handler.
-        (Yanking): New node.
-        (Yank Commands): Add yank-undo-function.
-        (Low-Level Kill Ring):
-        kill-new and kill-append have new arg yank-handler.
-        (Changing Properties): Add remove-list-of-text-properties.
-        (Atomic Changes): New node.
-        * symbols.texi (Other Plists): Add lax-plist-get, lax-plist-put.
-        * streams.texi (Output Variables): Add eval-expression-print-length
-        and eval-expression-print-level.
-        * os.texi (Time Conversion): For encode-time, explain limits on year.
-        * objects.texi (Character Type): Define anchor "modifier bits".
-        * modes.texi (Emulating Mode Line): New node.
-        (Search-based Fontification): Font Lock uses font-lock-face property.
-        (Other Font Lock Variables): Likewise.
-        * keymaps.texi (Format of Keymaps): Keymaps contain char tables,
-        not vectors.
-        (Active Keymaps): Add emulation-mode-map-alists.
-        (Functions for Key Lookup): key-binding has new arg no-remap.
-        (Remapping Commands): New node.
-        (Scanning Keymaps): where-is-internal has new arg no-remap.
-        (Tool Bar): Add tool-bar-local-item-from-menu.
-        Clarify when to use tool-bar-add-item-from-menu.
-        * commands.texi (Interactive Call): commandp has new arg.
-        (Command Loop Info): Add this-original-command.
-2003-08-06  John Paul Wallington  <jpw@gnu.org>
-        * compile.texi (Compiler Errors): Say `@end defmac' after `@defmac'.
-        * display.texi (Warning Basics): Fix typo.
-        (Fringes): Add closing curly bracket and fix typo.
-        * elisp.texi (Top): Fix typo.
-2003-08-05  Richard M. Stallman  <rms@gnu.org>
-        * elisp.texi: Update lists of subnodes.
-        * windows.texi (Buffers and Windows): set-window-buffer has new arg.
-        * variables.texi (Local Variables): Use lc for example variable names.
-        * tips.texi (Library Headers): Explain where to put -*-.
-        * strings.texi (Creating Strings): Fix xref for vconcat.
-        * sequences.texi (Vector Functions):
-        vconcat no longer allows integer args.
-        * minibuf.texi (Reading File Names): read-file-name has new
-        arg PREDICATE.  New function read-directory-name.
-        * macros.texi (Defining Macros): Give definition of `declare'
-        (Indenting Macros): New node.
-        * frames.texi (Parameter Access): Add modify-all-frames-parameters.
-        (Window Frame Parameters): Make separate table of parameters
-        that are coupled with specific face attributes.
-        (Deleting Frames): delete-frame-hooks renamed to
-        delete-frame-functions.
-        * files.texi (Magic File Names): Add file-remote-p.
-        Clarify file-local-copy.
-        * edebug.texi (Instrumenting Macro Calls): Don't define `declare'
-        here; instead xref Defining Macros.
-        * display.texi (Warnings): New node, and subnodes.
-        (Fringes): New node.
-        * debugging.texi (Test Coverage): New node.
-        * compile.texi (Compiler Errors): Explain with-no-warnings
-        and other ways to suppress warnings.
-        * commands.texi (Interactive Call): Minor clarification.
-        * buffers.texi (Buffer File Name): set-visited-file-name
-        renames the buffer too.
-        * abbrevs.texi (Abbrev Tables): Add copy-abbrev-table.
 2003-07-24  Markus Rost  <rost@math.ohio-state.edu>
        * abbrevs.texi (Abbrev Expansion): Use \s syntax in example.
@@ -851,11 +738,9 @@ Tue Apr 11 12:23:28 1989  Robert J. Chassell  (bob@rice-chex.ai.mit.edu)
        for the Project GNU development environment.
 ;; Local Variables:
-;; coding: iso-2022-7bit
+;; coding: iso-2022-7bit-unix
 ;; End:
    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  Copying and distribution of this file, with or without modification,
  are permitted provided the copyright notice and this notice are preserved.
-;;; arch-tag: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index d284684baf5..c05acc15bb2 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -166,5 +166,3 @@ dist: elisp elisp.dvi
        (cd temp/$(manual); rm -f *~)
        (cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
        -rm -rf temp
-# arch-tag: f5a1a94d-62e1-4460-a2d1-f02e538ab554
diff --git a/lispref/abbrevs.texi b/lispref/abbrevs.texi
index eec8722467f..e7ba0d8e8fa 100644
--- a/lispref/abbrevs.texi
+++ b/lispref/abbrevs.texi
@@ -80,11 +80,6 @@ This function undefines all the abbrevs in abbrev table @var{table},
 leaving it empty.  It always returns @code{nil}.
 @end defun
-@defun copy-abbrev-table table
-This function returns a copy of abbrev table @var{table}---a new
-abbrev table that contains the same abbrev definitions.
-@end defun
 @defun define-abbrev-table tabname definitions
 This function defines @var{tabname} (a symbol) as an abbrev table
 name, i.e., as a variable whose value is an abbrev table.  It defines
@@ -382,6 +377,3 @@ This is the local abbrev table used in Text mode.
 This is the local abbrev table used in Lisp mode and Emacs Lisp mode.
 @end defvar
-@ignore
-   arch-tag: 5ffdbe08-2cd4-48ec-a5a8-080f95756eec
-@end ignore
diff --git a/lispref/advice.texi b/lispref/advice.texi
index 46d4f96a35b..1733da39478 100644
--- a/lispref/advice.texi
+++ b/lispref/advice.texi
@@ -751,7 +751,3 @@ pieces of advice is the same.  The only difference is that
 executed even if some previous piece of advice had an error or a
 non-local exit.  If any around-advice is protected, then the whole
 around-advice onion is protected as a result.
-@ignore
-   arch-tag: 80c135c2-f1c3-4f8d-aa85-f8d8770d307f
-@end ignore
diff --git a/lispref/anti.texi b/lispref/anti.texi
index 657ee5b9e88..7925a8831df 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -293,7 +293,3 @@ and allied functions.
 @code{file-attributes} returns the file size and the file inode number
 only as a simple integer.
 @end itemize
-@ignore
-   arch-tag: 1d0ef137-2bad-430e-ae8e-d820d569b5a6
-@end ignore
diff --git a/lispref/back.texi b/lispref/back.texi
index bb68ff2d9ab..b34a5b37339 100644
--- a/lispref/back.texi
+++ b/lispref/back.texi
@@ -31,7 +31,3 @@ are peculiar to Emacs Lisp or relate specifically to editing.
 @hfil
 @bye
-@ignore
-   arch-tag: ac7694c8-1f02-4b42-9531-33ba13b179e1
-@end ignore
diff --git a/lispref/backups.texi b/lispref/backups.texi
index d4809369bcc..602c5c6dbec 100644
--- a/lispref/backups.texi
+++ b/lispref/backups.texi
@@ -729,7 +729,3 @@ This normal hook is run by @code{revert-buffer} after inserting
 the modified contents---but only if @code{revert-buffer-function} is
 @code{nil}.
 @end defvar
-@ignore
-   arch-tag: 295a6321-e5ab-46d5-aef5-0bb4f447a67f
-@end ignore
diff --git a/lispref/book-spine.texinfo b/lispref/book-spine.texinfo
index cb52cc6fc3c..8633d477aca 100644
--- a/lispref/book-spine.texinfo
+++ b/lispref/book-spine.texinfo
@@ -23,7 +23,3 @@
 @sp 5
 @center Free Software Foundation
 @bye
-@ignore
-   arch-tag: 4466c7ca-e549-4119-948c-6eed34e1ff87
-@end ignore
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index c811f0b0017..8bfbf755a29 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -444,13 +444,10 @@ such buffer in the buffer list.
 If @var{filename} is a non-empty string, this function changes the
 name of the file visited in the current buffer to @var{filename}.  (If the
 buffer had no visited file, this gives it one.)  The @emph{next time}
-the buffer is saved it will go in the newly-specified file.
+the buffer is saved it will go in the newly-specified file.  This
+command marks the buffer as modified, since it does not (as far as Emacs
-This command marks the buffer as modified, since it does not (as far
+knows) match the contents of @var{filename}, even if it matched the
-as Emacs knows) match the contents of @var{filename}, even if it
+former visited file.
-matched the former visited file.  It also renames the buffer to
-correspond to the new file name, unless the new name is already in
-use.
 If @var{filename} is @code{nil} or the empty string, that stands for
 ``no visited file''.  In this case, @code{set-visited-file-name} marks
@@ -1021,7 +1018,3 @@ This function returns the current gap position in the current buffer.
 @defun gap-size
 This function returns the current gap size of the current buffer.
 @end defun
-@ignore
-   arch-tag: 2e53cfab-5691-41f6-b5a8-9c6a3462399c
-@end ignore
diff --git a/lispref/calendar.texi b/lispref/calendar.texi
index c93fd016d4f..eeee2d118b5 100644
--- a/lispref/calendar.texi
+++ b/lispref/calendar.texi
@@ -990,7 +990,3 @@ message window, when its time is up.
 The number of seconds to display an appointment message.  The default
 is 5 seconds.
 @end table
-@ignore
-   arch-tag: 8e50c766-4703-4888-a421-af15244cca7e
-@end ignore
diff --git a/lispref/commands.texi b/lispref/commands.texi
index b60cb2b8732..56e5c811d9c 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -503,7 +503,7 @@ command is a function, @code{command-execute} calls
 @code{call-interactively}, which reads the arguments and calls the
 command.  You can also call these functions yourself.
-@defun commandp object &optional for-call-interactively
+@defun commandp object
 Returns @code{t} if @var{object} is suitable for calling interactively;
 that is, if @var{object} is a command.  Otherwise, returns @code{nil}.
@@ -514,13 +514,11 @@ expressions, autoload objects that are declared as interactive
 (non-@code{nil} fourth argument to @code{autoload}), and some of the
 primitive functions.
-A symbol satisfies @code{commandp} if its function definition
+A symbol satisfies @code{commandp} if its function definition satisfies
-satisfies @code{commandp}.  Keys and keymaps are not commands.
+@code{commandp}.
-Rather, they are used to look up commands (@pxref{Keymaps}).
-If @var{for-call-interactively} is non-@code{nil}, then
+Keys and keymaps are not commands.  Rather, they are used to look up
-@code{commandp} returns @code{t} only for objects that
+commands (@pxref{Keymaps}).
-@code{call-interactively} could call---thus, not for keyboard macros.
 See @code{documentation} in @ref{Accessing Documentation}, for a
 realistic example of using @code{commandp}.
@@ -663,10 +661,6 @@ non-@code{nil}.  Here's how:
    (message "foo")))
 @end example
-@noindent
-Defined in this way, the function does display the message when
-called from a keyboard macro.
  The numeric prefix argument, provided by @samp{p}, is never @code{nil}.
 @node Command Loop Info
@@ -733,14 +727,6 @@ We do not bind @code{this-command} with @code{let} because that would
 restore the old value in case of error---a feature of @code{let} which
 in this case does precisely what we want to avoid.
-@defvar this-original-command
-This has the same value as @code{this-command} except when command
-remapping occurs (@pxref{Remapping Commands}).  In that case,
-@code{this-command} gives the command actually run (the result of
-remapping), and @code{this-original-command} gives the command that
-was specified to run but remapped into another command.
-@end defvar
 @defun this-command-keys
 This function returns a string or vector containing the key sequence
 that invoked the present command, plus any previous commands that
@@ -2833,7 +2819,3 @@ This normal hook (@pxref{Standard Hooks}) is run when a keyboard
 macro terminates, regardless of what caused it to terminate (reaching
 the macro end or an error which ended the macro prematurely).
 @end defvar
-@ignore
-   arch-tag: e34944ad-7d5c-4980-be00-36a5fe54d4b1
-@end ignore
diff --git a/lispref/compile.texi b/lispref/compile.texi
index 4d91d2c5883..583454efe73 100644
--- a/lispref/compile.texi
+++ b/lispref/compile.texi
@@ -421,42 +421,6 @@ defined are always ``located'' at the end of the file, so these
 commands won't find the places they are really used.  To do that,
 you must search for the function names.
 
-  You can suppress the compiler warning for calling an undefined
-function @var{func} by conditionalizing the function call on a
-@code{fboundp} test, like this:
-@example
-(if (fboundp '@var{func}) ...(@var{func} ...)...)
-@end example
-@noindent
-The call to @var{func} must be in the @var{then-form} of the @code{if},
-and @var{func} must appear quoted in the call to @code{fboundp}.
-Likewise, you can suppress a compiler warning for an unbound variable
-@var{variable} by conditionalizing its use on a @code{boundp} test,
-like this:
-@example
-(if (boundp '@var{variable}) ...@var{variable}...)
-@end example
-@noindent
-The reference to @var{variable} must be in the @var{then-form} of the
-@code{if}, and @var{variable} must appear quoted in the call to
-@code{boundp}.
-  You can suppress any compiler warnings using the construct
-@code{with-no-warnings}:
-@defmac with-no-warnings body...
-In execution, this is equivalent to @code{(progn @var{body}...)},
-but the compiler does not issue warnings for anything that occurs
-inside @var{body}.
-We recommend that you use this construct around the smallest
-possible piece of code.
-@end defmac
 @node Byte-Code Objects
 @section Byte-Code Function Objects
 @cindex compiled function
@@ -802,6 +766,3 @@ The @code{silly-loop} function is somewhat more complex:
 @end example
-@ignore
-   arch-tag: f78e3050-2f0a-4dee-be27-d9979a0a2289
-@end ignore
diff --git a/lispref/configure.in b/lispref/configure.in
index 7db2f8cab5e..be5f5f7e743 100644
--- a/lispref/configure.in
+++ b/lispref/configure.in
@@ -1,7 +1,3 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(elisp.texi)
 AC_OUTPUT(Makefile)
-m4_if(dnl       Do not change this comment
-   arch-tag: 61db4227-0d2b-4c4d-ad54-ca9a1ee518ea
-)dnl
diff --git a/lispref/control.texi b/lispref/control.texi
index 71502f03106..a9f4d7c9d22 100644
--- a/lispref/control.texi
+++ b/lispref/control.texi
@@ -1240,7 +1240,3 @@ quit, and the quit happens immediately after the function
 @code{ftp-setup-buffer} returns but before the variable @code{process} is
 set, the process will not be killed.  There is no easy way to fix this bug,
 but at least it is very unlikely.
-@ignore
-   arch-tag: 8abc30d4-4d3a-47f9-b908-e9e971c18c6d
-@end ignore
diff --git a/lispref/customize.texi b/lispref/customize.texi
index d92b44470a9..41d29edf981 100644
--- a/lispref/customize.texi
+++ b/lispref/customize.texi
@@ -975,8 +975,7 @@ When you move to this item with @code{widget-forward} or
 @code{widget-backward}, it will display the string @var{motion-doc} in
 the echo area.  In addition, @var{motion-doc} is used as the mouse
 @code{help-echo} string and may actually be a function or form evaluated
-to yield a help string.  If it is a function, it is called with one
+to yield a help string as for @code{help-echo} text properties.
-argument, the widget.
 @c @xref{Text help-echo}.
 @item :match @var{function}
@@ -1055,7 +1054,3 @@ arguments, which will be used when creating the @code{radio-button} or
 @code{checkbox} associated with this item.
 @end ignore
 @end table
-@ignore
-   arch-tag: d1b8fad3-f48c-4ce4-a402-f73b5ef19bd2
-@end ignore
diff --git a/lispref/debugging.texi b/lispref/debugging.texi
index cc3fc7a9bd9..f0bbc9207cb 100644
--- a/lispref/debugging.texi
+++ b/lispref/debugging.texi
@@ -30,7 +30,6 @@ compiler, you need to know how to examine the compiler's input buffer.
 * Debugger::            How the Emacs Lisp debugger is implemented.
 * Edebug::              A source-level Emacs Lisp debugger.
 * Syntax Errors::       How to find syntax errors.
-* Test Coverage::       Ensuring you have tested all branches in your code.
 * Compilation Errors::  How to find errors that show up in byte compilation.
 @end menu
@@ -739,42 +738,6 @@ the old indentation actually fits the intended nesting of parentheses,
 and you have put back those parentheses, @kbd{C-M-q} should not change
 anything.
-@node Test Coverage
-@section Test Coverage
-@cindex coverage testing
-@findex testcover-start
-@findex testcover-mark-all
-@findex testcover-next-mark
-  You can do coverage testing for a file of Lisp code by first using
-the command @kbd{M-x testcover-start @key{RET} @var{file} @key{RET}}
-to instrument it.  Then test your code by calling it one or more
-times.  Then use the command @kbd{M-x testcover-mark-all} to display
-``splotches'' on the code to show where coverage is insufficient.  The
-command @kbd{M-x testcover-next-mark} will move point forward to the
-next spot that has a splotch.
-  Normally, a red splotch indicates the form was never completely
-evaluated; a brown splotch means it always evaluated to the same value
-(meaning there has been little testing of what is done with the
-result).  However, the red splotch is skipped for forms that can't
-possibly complete their evaluation, such as @code{error}.  The brown
-splotch is skipped for forms that are expected to always evaluate to
-the same value, such as @code{(setq x 14)}.
-  For difficult cases, you can add do-nothing macros to your code to
-give advice to the test coverage tool.
-@defmac 1value form
-Evaluate @var{form} and return its value, but inform coverage testing
-that @var{form}'s value should always be the same.
-@end defmac
-@defmac noreturn form
-Evaluate @var{form}, informing coverage testing that @var{form} should
-never return.  If it ever does return, you get a run-time error.
-@end defmac
 @node Compilation Errors
 @section Debugging Problems in Compilation
@@ -799,7 +762,3 @@ the error.
 successfully, then point is located at the end of the form.  In this
 case, this technique can't localize the error precisely, but can still
 show you which function to check.
-@ignore
-   arch-tag: ddc57378-b0e6-4195-b7b6-43f8777395a7
-@end ignore
diff --git a/lispref/display.texi b/lispref/display.texi
index be85f9117b1..d7ca6b65cbe 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -15,7 +15,6 @@ that Emacs presents to the user.
 * Forcing Redisplay::   Forcing redisplay.
 * Truncation::          Folding or wrapping long text lines.
 * The Echo Area::       Where messages are displayed.
-* Warnings::            Displaying warning messages for the user.
 * Invisible Text::      Hiding part of the buffer text.
 * Selective Display::   Hiding part of the buffer text (the old way).
 * Overlay Arrow::       Display of an arrow to indicate position.
@@ -24,7 +23,6 @@ that Emacs presents to the user.
 * Width::               How wide a character or string is on the screen.
 * Faces::               A face defines a graphics style for text characters:
                          font, colors, etc.
-* Fringes::             Controlling window fringes.
 * Display Property::    Enabling special display features.
 * Images::              Displaying images in Emacs buffers.
 * Blinking::            How Emacs shows the matching open parenthesis.
@@ -113,9 +111,10 @@ the rightmost column indicates a line that ``wraps'' onto the next line,
 which is also called @dfn{continuing} the line.  (The display table can
 specify alternative indicators; see @ref{Display Tables}.)
+@cindex fringes, and line continuation/truncation indicators
  On a windowed display, the @samp{$} and @samp{\} indicators are
-replaced with graphics bitmaps displayed in the window fringes
+replaced with graphics bitmaps displayed on the thin areas right near
-(@pxref{Fringes}).
+the window edges, called the @dfn{fringes}.
  Note that continuation is different from filling; continuation happens
 on the screen only, not in the buffer contents, and it breaks a line
@@ -328,194 +327,6 @@ sequence are echoed immediately.)
 If the value is zero, then command input is not echoed.
 @end defvar
-@node Warnings
-@section Reporting Warnings
-@cindex warnings
-  @dfn{Warnings} are a facility for a program to inform the user of a
-possible problem, but continue running.
-@menu
-* Warning Basics::      Warnings concepts and functions to report them.
-* Warning Variables::   Variables programs bind to customize their warnings.
-* Warning Options::     Variables users set to control display of warnings.
-@end menu
-@node Warning Basics
-@subsection Warning Basics
-@cindex severity level
-  Every warning has a textual message, which explains the problem for
-the user, and a @dfn{severity level} which is a symbol.  Here are the
-possible severity levels, in order of decreasing severity, and their
-meanings:
-@table @code
-@item :emergency
-A problem that will seriously impair Emacs operation soon
-if you do not attend to it promptly.
-@item :error
-A report of data or circumstances that are inherently wrong.
-@item :warning
-A report of data or circumstances that are not inherently wrong, but
-raise suspicion of a possible problem.
-@item :debug
-A report of information that may be useful if you are debugging.
-@end table
-  When your program encounters invalid input data, it can either
-signal a Lisp error by calling @code{error} or @code{signal} or report
-a warning with severity @code{:error}.  Signaling a Lisp error is the
-easiest thing to do, but it means the program cannot continue
-processing.  If you want to take the trouble to implement a way to
-continue processing despite the bad data, then reporting a warning of
-severity @code{:error} is the right way to inform the user of the
-problem.  For instance, the Emacs Lisp byte compiler can report an
-error that way and continue compiling other functions.  (If the
-program signals a Lisp error and then handles it with
-@code{condition-case}, the user won't see the error message; it could
-show the message to the user by reporting it as a warning.)
-@cindex warning type
-  Each warning has a @dfn{warning type} to classify it.  The type is a
-list of symbols.  The first symbol should be the custom group that you
-use for the program's user options.  For example, byte compiler
-warnings use the warning type @code{(bytecomp)}.  You can also
-subcategorize the warnings, if you wish, by using more symbols in the
-list.
-@defun display-warning type message &optional level buffer-name
-This function reports a warning, using @var{message} as the message
-and @var{type} as the warning type.  @var{level} should be the
-severity level, with @code{:warning} being the default.
-@var{buffer-name}, if non-@code{nil}, specifies the name of the buffer
-for logging the warning.  By default, it is @samp{*Warnings*}.
-@end defun
-@defun lwarn type level message &rest args
-This function reports a warning using the value of @code{(format
-@var{message} @var{args}...)} as the message.  In other respects it is
-equivalent to @code{display-warning}.
-@end defun
-@defun warn message &rest args
-This function reports a warning using the value of @code{(format
-@var{message} @var{args}...)} as the message, @code{(emacs)} as the
-type, and @code{:warning} as the severity level.  It exists for
-compatibility only; we recommend not using it, because you should
-specify a specific warning type.
-@end defun
-@node Warning Variables
-@subsection Warning Variables
-  Programs can customize how their warnings appear by binding
-the variables described in this section.
-@defvar warning-levels
-This list defines the meaning and severity order of the warning
-severity levels.  Each element defines one severity level,
-and they are arranged in order of decreasing severity.
-Each element has the form @code{(@var{level} @var{string}
-@var{function})}, where @var{level} is the severity level it defines.
-@var{string} specifies the textual description of this level.
-@var{string} should use @samp{%s} to specify where to put the warning
-type information, or it can omit the @samp{%s} so as not to include
-that information.
-The optional @var{function}, if non-@code{nil}, is a function to call
-with no arguments, to get the user's attention.
-Normally you should not change the value of this variable.
-@end defvar
-@defvar warning-prefix-function
-If non-@code{nil}, te value is a function to generate prefix text for
-warnings.  Programs can bind the variable to a suitable function.
-@code{display-warning} calls this function with the warnings buffer
-current, and the function can insert text in it.  That text becomes
-the beginning of the warning message.
-The function is called with two arguments, the severity level and its
-entry in @code{warning-levels}.  It should return a list to use as the
-entry (this value need not be an actual member of
-@code{warning-levels}).  By constructing this value, the function to
-change the severity of the warning, or specify different handling for
-a given severity level.
-If the variable's value is @code{nil} then there is no function
-to call.
-@end defvar
-@defvar warning-series
-Programs can bind this variable to @code{t} to say that the next
-warning should begin a series.  When several warnings form a series,
-that means to leave point on the first warning of the series, rather
-than keep move it for each warning so that it appears on the last one.
-The series ends when the local binding is unbound and
-@code{warning-series} becomes @code{nil} again.
-The value can also be a symbol with a function definition.  That is
-equivalent to @code{t}, except that the next warning will also call
-the function with no arguments with the warnings buffer current.  The
-function can insert text which will serve as a header for the series
-of warnings.
-Once a series has begun, the value is a marker which points to the
-buffer position in the warnings buffer of the start of the series.
-The variable's normal value is @code{nil}, which means to handle
-each warning separately.
-@end defvar
-@defvar warning-fill-prefix
-When this variable is non-@code{nil}, it specifies a fill prefix to
-use for filling each warning's text.
-@end defvar
-@defvar warning-type-format
-This variable specifies the format for displaying the warning type
-in the warning message.  The result of formatting the type this way
-gets included in the message under the control of the string in the
-entry in @code{warning-levels}.  The default value is @code{" (%s)"}.
-If you bind it to @code{""} then the warning type won't appear at
-all.
-@end defvar
-@node Warning Options
-@subsection Warning Options
-  These variables are used by users to control what happens
-when a Lisp program reports a warning.
-@defopt warning-minimum-level
-This user option specifies the minimum severity level that should be
-shown immediately to the user.  The default is @code{:warning}, which
-means to immediately display all warnings except @code{:debug}
-warnings.
-@end defopt
-@defopt warning-minimum-log-level
-This user option specifies the minimum severity level that should be
-logged in the warnings buffer.  The default is @code{:warning}, which
-means to log all warnings except @code{:debug} warnings.
-@end defopt
-@defopt warning-suppress-types
-This list specifies which warning types should not be displayed
-immediately for the user.  Each element of the list should be a list
-of symbols.  If its elements match the first elements in a warning
-type, then that warning is not displayed immediately.
-@end defopt
-@defopt warning-suppress-log-types
-This list specifies which warning types should not be logged in the
-warnings buffer.  Each element of the list should be a list of
-symbols.  If it matches the first few elements in a warning type, then
-that warning is not logged.
-@end defopt
 @node Invisible Text
 @section Invisible Text
@@ -761,6 +572,7 @@ interface to debuggers, the overlay arrow indicates the line of code
 about to be executed.
 @defvar overlay-arrow-string
+@cindex fringe, and overlay arrow display
 This variable holds the string to display to call attention to a
 particular line, or @code{nil} if the arrow feature is not in use.
 On a graphical display the contents of the string are ignored; instead a
@@ -987,14 +799,12 @@ of them:
 @table @code
 @item priority
 @kindex priority @r{(overlay property)}
-This property's value (which should be a nonnegative integer number)
+This property's value (which should be a nonnegative number) determines
-determines the priority of the overlay.  The priority matters when two
+the priority of the overlay.  The priority matters when two or more
-or more overlays cover the same character and both specify the same
+overlays cover the same character and both specify a face for display;
-property; the one whose @code{priority} value is larger takes priority
+the one whose @code{priority} value is larger takes priority over the
-over the other.  For the @code{face} property, the higher priority
+other, and its face attributes override the face attributes of the lower
-value does not completely replace the other; instead, its face
+priority overlay.
-attributes override the face attributes of the lower priority
-@code{face} property.
 Currently, all overlays take priority over text properties.  Please
 avoid using negative priority values, as we have not yet decided just
@@ -2477,54 +2287,6 @@ Then, the font specifications for all but Chinese GB2312 characters have
 Chinese GB2312 characters has a wild card @samp{*} in the @var{family}
 field.
-@node Fringes
-@section Fringes
-@cindex Fringes
-  The @dfn{fringes} of a window are thin vertical strips down the
-sides that are used for displaying bitmaps that indicate truncation,
-continuation, and horizontal scrolling, the overlay arrow.  The
-fringes normally appear between the display margins and the window
-text, but you can put them outside the display margins for a specific
-buffer by setting @code{fringes-outside-margins} buffer-locally to a
-non-@code{nil} value.
-@defvar fringes-outside-margins
-If the value is non-@code{nil}, the frames appear outside
-the display margins. 
-@end defvar
-@defvar left-fringe-width
-This variable, if non-@code{nil}, specifies the width of the left
-fringe in pixels.
-@end defvar
-@defvar right-fringe-width
-This variable, if non-@code{nil}, specifies the width of the right
-fringe in pixels.
-@end defvar
-  The values of these variables take effect when you display the
-buffer in a window.  If you change them while the buffer is visible,
-you can call @code{set-buffer-window} to display it in a window again.
-@defun set-window-fringes window left &optional right outside-margins
-This function sets the fringe widthes of window @var{window}.
-If window is @code{nil}, that stands for the selected window.
-The argument @var{left} specifies the width in pixels of the left
-fringe, and likewise @var{right} for the right fringe.  A value of
-@code{nil} for either one stands for the default width.  If
-@var{outside-margins} is non-@code{nil}, that specifies that fringes
-should appear outside of the display margins.
-@end defun
-@defun window-fringes window
-This function returns information about the fringes of a window
-@var{window}.  The value has the form @code{(@var{left-width}
-@var{right-width} @var{frames-outside-margins})}.
-@end defun
 @node Display Property
 @section The @code{display} Property
 @cindex display specification
@@ -3463,9 +3225,9 @@ buffers that do not override it.  @xref{Default Value}.
 @defopt indicate-empty-lines
 @tindex indicate-empty-lines
 @cindex fringes, and empty line indication
-When this is non-@code{nil}, Emacs displays a special glyph in the
+When this is non-@code{nil}, Emacs displays a special glyph in
-fringe of each empty line at the end of the buffer, on terminals that
+each empty line at the end of the buffer, on terminals that
-support it (window systems).  @xref{Fringes}.
+support it (window systems).
 @end defopt
 @defopt tab-width
@@ -3772,7 +3534,3 @@ This hook is used for internal purposes: setting up communication with
 the window system, and creating the initial window.  Users should not
 interfere with it.
 @end defvar
-@ignore
-   arch-tag: ffdf5714-7ecf-415b-9023-fbc6b409c2c6
-@end ignore
diff --git a/lispref/doclicense.texi b/lispref/doclicense.texi
index 1c7a4d05989..de1bd20af20 100644
--- a/lispref/doclicense.texi
+++ b/lispref/doclicense.texi
@@ -366,7 +366,3 @@ If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License,
 to permit their use in free software.
-@ignore
-   arch-tag: 9014cf6e-f3c4-401d-b8da-4fe52723984c
-@end ignore
diff --git a/lispref/edebug.texi b/lispref/edebug.texi
index 051a7467ebc..8ddbcf7a74f 100644
--- a/lispref/edebug.texi
+++ b/lispref/edebug.texi
@@ -1077,14 +1077,15 @@ For example, (for i from 1 to 10 do (print i))."
  ...)
 @end example
-  The Edebug specifation says which parts of a call to the macro are
+@defspec declare (edebug @var{specification})
-forms to be evaluated.  For simple macros, the @var{specification}
+Specify which expressions of a call to the macro in which the
-often looks very similar to the formal argument list of the macro
+declaration appears are forms to be evaluated.  For simple macros, the
-definition, but specifications are much more general than macro
+@var{specification} often looks very similar to the formal argument list
-arguments.  @xref{Defining Macros}, for more explanation of
+of the macro definition, but specifications are much more general than
-the @code{declare} special form.
+macro arguments.
+@end defspec
-  You can also define an edebug specification for a macro separately
+You can also define an edebug specification for a macro separately
 from the macro definition with @code{def-edebug-spec}.  Adding
 @code{edebug} declarations is preferred, and more convenient, for
 macro definitions in Lisp, but @code{def-edebug-spec} makes it
@@ -1553,7 +1554,3 @@ If non-@code{nil}, an expression to test for at every stop point.  If
 the result is non-@code{nil}, then break.  Errors are ignored.
 @xref{Global Break Condition}.
 @end defopt
-@ignore
-   arch-tag: 74842db8-019f-4818-b5a4-b2de878e57fd
-@end ignore
diff --git a/lispref/elisp-covers.texi b/lispref/elisp-covers.texi
index 66c3a3b3e6b..c536e9e6b25 100644
--- a/lispref/elisp-covers.texi
+++ b/lispref/elisp-covers.texi
@@ -246,7 +246,3 @@
 @end titlepage
 @bye
-@ignore
-   arch-tag: 02d65d63-3b64-49bc-a5c0-bfd5eabb6c98
-@end ignore
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 26e78941c3d..8f8a2c9d8fd 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -415,7 +415,6 @@ Macros
 * Backquote::               Easier construction of list structure.
 * Problems with Macros::    Don't evaluate the macro arguments too many times.
                              Don't hide the user's variables.
-* Indenting Macros::        Specifying how to indent macro calls.
 Loading
@@ -535,7 +534,6 @@ Keymaps
 * Key Lookup::                  How extracting elements from keymaps works.
 * Functions for Key Lookup::    How to request key lookup.
 * Changing Key Bindings::       Redefining a key in a keymap.
-* Remapping Commands::          Bindings that translate one command to another.
 * Key Binding Commands::        Interactive interfaces for redefining keys.
 * Scanning Keymaps::            Looking through all keymaps, for printing help.
@@ -740,16 +738,12 @@ Text
 * Transposition::           Swapping two portions of a buffer.
 * Registers::               How registers are implemented.  Accessing
                              the text or position stored in a register.
-* Atomic Changes::          Installing several buffer changs ``atomically''.
-* Base 64::                 Conversion to or from base 64 encoding.
-* MD5 Checksum::            Compute the MD5 ``message digest''/``checksum''.
 * Change Hooks::            Supplying functions to be run when text is changed.
 The Kill Ring
 * Kill Ring Concepts::      What text looks like in the kill ring.
 * Kill Functions::          Functions that kill text.
-* Yanking::                 How yanking is done.
 * Yank Commands::           Commands that access the kill ring.
 * Low-Level Kill Ring::     Functions and variables for kill ring access.
 * Internals of Kill Ring::  Variables that hold kill-ring data.
@@ -858,7 +852,6 @@ Receiving Output from Processes
 * Process Buffers::         If no filter, output is put in a buffer.
 * Filter Functions::        Filter functions accept output from the process.
-* Decoding Output::         Filters can get unibyte or multibyte strings.
 * Accepting Output::        How to wait until process output arrives.
 Operating System Interface
@@ -889,21 +882,12 @@ Emacs Display
 * Refresh Screen::          Clearing the screen and redrawing everything on it.
 * Truncation::              Folding or wrapping long text lines.
 * The Echo Area::           Where messages are displayed.
-* Warnings::                Displaying warning messages for the user.
 * Selective Display::       Hiding part of the buffer text.
 * Overlay Arrow::           Display of an arrow to indicate position.
 * Temporary Displays::      Displays that go away automatically.
-* Overlays::                Use overlays to highlight parts of the buffer.
+* Waiting::                 Forcing display update and waiting for user.
-* Width::                   How wide a character or string is on the screen.
-* Faces::                   A face defines a graphics style
-                              for text characters: font, colors, etc.
-* Fringes::                 Controlling window fringes.
-* Display Property::        Enabling special display features.
-* Images::                  Displaying images in Emacs buffers.
 * Blinking::                How Emacs shows the matching open parenthesis.
-* Inverse Video::           Specifying how the screen looks.
+* Usual Display::           How control characters are displayed.
-* Usual Display::           The usual conventions for displaying nonprinting chars.
-* Display Tables::          How to specify other conventions.
 * Beeping::                 Audible signal to the user.
 * Window Systems::          Which window system is being used.
@@ -1004,7 +988,3 @@ Object Internals
 These words prevent "local variables" above from confusing Emacs.
-@ignore
-   arch-tag: f7e9a219-a0e1-4776-b631-08eaa1d49b34
-@end ignore
diff --git a/lispref/errors.texi b/lispref/errors.texi
index 965090aeb13..14797d61011 100644
--- a/lispref/errors.texi
+++ b/lispref/errors.texi
@@ -187,7 +187,3 @@ mathematical functions.
 @code{"Arithmetic underflow error"}@*
 @xref{Math Functions}.
 @end table
-@ignore
-   arch-tag: 717c6048-5d9d-4c7d-9a62-df57390b6f19
-@end ignore
diff --git a/lispref/eval.texi b/lispref/eval.texi
index 5a9cb6117e2..fa90ff07be1 100644
--- a/lispref/eval.texi
+++ b/lispref/eval.texi
@@ -719,7 +719,3 @@ particular elements, like this:
 @end group
 @end example
 @end defvar
-@ignore
-   arch-tag: f723a4e0-31b3-453f-8afc-0bf8fd276d57
-@end ignore
diff --git a/lispref/files.texi b/lispref/files.texi
index 4dab4f13e62..c594f0a78a0 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -2461,22 +2461,15 @@ for comparison with @code{inhibit-file-name-operation}.
 @end defun
 @defun file-local-copy filename
-This function copies file @var{filename} to an ordinary non-magic file
+This function copies file @var{filename} to an ordinary non-magic file,
-on the local machine, if it isn't on the local machine already.  Magic
+if it isn't one already.
-file names should handle the @code{file-local-copy} operation if they
-refer to files on other machines.  A magic file name that is used for
+If @var{filename} specifies a magic file name, which programs
-other purposes than remote file access should not handle
+outside Emacs cannot directly read or write, this copies the contents to
-@code{file-local-copy}; then this function will treat the file as
+an ordinary file and returns that file's name.
-local.
-If @var{filename} is local, whether magic or not, this function does
-nothing and returns @code{nil}.  Otherwise it returns the file name
-of the local copy file.
-@end defun
-@defun file-remote-p filename
+If @var{filename} is an ordinary file name, not magic, then this function
-This functions return @code{t} if @var{filename} is a remote file---that is,
+does nothing and returns @code{nil}.
-a magic file name that handles @code{file-local-copy}.
 @end defun
 @defun unhandled-file-name-directory filename
@@ -2644,7 +2637,3 @@ a list of format names, just like the value of
 @code{buffer-file-format} for writing auto-save files.  This variable is
 always buffer-local in all buffers.
 @end defvar
-@ignore
-   arch-tag: 141f74ce-6ae3-40dc-a6c4-ef83fc4ec35c
-@end ignore
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 76b4228cc4f..fd9e74bea36 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -225,13 +225,6 @@ parameter.  If you don't mention a parameter in @var{alist}, its value
 doesn't change.
 @end defun
-@defun modify-all-frames-parameters alist
-This function alters the frame parameters of all existing frames
-according to @var{alist}, then modifies @code{default-frame-alist}
-to apply the same parameter values to frames that will be created
-henceforth.
-@end defun
 @node Initial Parameters
 @subsection Initial Frame Parameters
@@ -430,6 +423,13 @@ considers that buffer.
 A list of buffers that have been selected in this frame,
 ordered most-recently-selected first.
+@item font
+The name of the font for displaying text in the frame.  This is a
+string, either a valid font name for your system or the name of an Emacs
+fontset (@pxref{Fontsets}).  Changing this frame parameter on a frame
+also changes the font-related attributes of the default face on that
+frame.
 @item auto-raise
 Whether selecting the frame raises it (non-@code{nil} means yes).
@@ -447,8 +447,7 @@ Whether the frame has scroll bars for horizontal scrolling
 implemented.)
 @item scroll-bar-width
-The width of the vertical scroll bar, in pixels,
+The width of the vertical scroll bar, in pixels.
-or @code{nil} meaning to use the default width.
 @item icon-type
 The type of icon to use for this frame when it is iconified.  If the
@@ -460,10 +459,33 @@ picture of a gnu); @code{nil} specifies a text icon.
 The name to use in the icon for this frame, when and if the icon
 appears.  If this is @code{nil}, the frame's title is used.
+@item foreground-color
+The color to use for the image of a character.  This is a string; the
+window system defines the meaningful color names.  Changing this
+parameter is equivalent to changing the foreground color of the face
+@code{default} on the frame in question.
+@item background-color
+The color to use for the background of characters.  Changing this
+parameter is equivalent to changing the foreground color of the face
+@code{default} on the frame in question.
 @item background-mode
 This parameter is either @code{dark} or @code{light}, according
 to whether the background color is a light one or a dark one.
+@item mouse-color
+The color for the mouse pointer.  Changing this parameter is equivalent
+to changing the background color of face @code{mouse}.
+@item cursor-color
+The color for the cursor that shows point.  Changing this parameter is
+equivalent to changing the background color of face @code{cursor}.
+@item border-color
+The color for the border of the frame.  Changing this parameter is
+equivalent to changing the background color of face @code{border}.
 @item tty-color-mode
 @cindex standard colors for character terminals
 This parameter overrides the terminal's color support as given by the
@@ -478,6 +500,16 @@ value is a symbol, that symbol is looked up in the alist
 @code{tty-color-mode-alist}, and if found, the associated number is
 used as the color support mode.
+@item scroll-bar-foreground
+If non-@code{nil}, the color for the foreground of scroll bars.
+Changing this parameter is equivalent to setting the foreground color of
+face @code{scroll-bar}.
+@item scroll-bar-background
+If non-@code{nil}, the color for the background of scroll bars.
+Changing this parameter is equivalent to setting the background color of
+face @code{scroll-bar}.
 @item display-type
 This parameter describes the range of possible colors that can be used
 in this frame.  Its value is @code{color}, @code{grayscale} or
@@ -515,22 +547,6 @@ The width in pixels of the window border.
 @item internal-border-width
 The distance in pixels between text and border.
-@item left-fringe
-@itemx right-fringe
-The default width of the left and right fringes of windows in this
-frame (@pxref{Fringes}).  If either of these is zero, that effectively
-removes the corresponding fringe.  A value of @code{nil} stands for
-the standard fringe width, which is the width needed to display the
-fringe bitmaps.
-The combined fringe widths must add up to an integral number of
-columns, so the actual default fringe widths for the frame may be
-larger than the specified values.  The extra width needed to reach an
-acceptable total is distributed evenly between the left and right
-fringe.  However, you can force one frame or the other to a precise
-width by specifying that width a negative integer.  If both widths are
-negative, only the left fringe gets the specified width.
 @item unsplittable
 If non-@code{nil}, this frame's window is never split automatically.
@@ -595,47 +611,6 @@ in this variable do not take effect immediately, because the variable
 is examined only when you specify a cursor type for a frame.
 @end defvar
-These frame parameters are semi-obsolete in that they are automatically
-equivalent to particular face attributes of particular faces.
-@table @code
-@item font
-The name of the font for displaying text in the frame.  This is a
-string, either a valid font name for your system or the name of an Emacs
-fontset (@pxref{Fontsets}).  It is equivalent to the @code{font}
-attribute of the @code{default} face.
-@item foreground-color
-The color to use for the image of a character.  It is equivalent to
-the @code{:foreground} attribute of the @code{default} face.
-@item background-color
-The color to use for the background of characters.  It is equivalent to
-the @code{:background} attribute of the @code{default} face.
-@item mouse-color
-The color for the mouse pointer.  It is equivalent to the @code{:background}
-attribute of the @code{mouse} face.
-@item cursor-color
-The color for the cursor that shows point.  It is equivalent to the
-@code{:background} attribute of the @code{cursor} face.
-@item border-color
-The color for the border of the frame.  It is equivalent to the
-@code{:background} attribute of the @code{border} face.
-@item scroll-bar-foreground
-If non-@code{nil}, the color for the foreground of scroll bars.  It is
-equivalent to the @code{:foreground} attribute of the
-@code{scroll-bar} face.
-@item scroll-bar-background
-If non-@code{nil}, the color for the background of scroll bars.  It is
-equivalent to the @code{:background} attribute of the
-@code{scroll-bar} face.
-@end table
 @node Size and Position
 @subsection Frame Size And Position
 @cindex size of frame
@@ -823,10 +798,10 @@ configuration (@pxref{Frame Configurations}); this is similar to the
 way windows behave.
 @deffn Command delete-frame &optional frame force
-@vindex delete-frame-functions
+@vindex delete-frame-hook
 This function deletes the frame @var{frame} after running the hook
-@code{delete-frame-functions} (each function gets one argument,
+@code{delete-frame-hook}.  By default, @var{frame} is the selected
-@var{frame}).  By default, @var{frame} is the selected frame.
+frame.
 A frame cannot be deleted if its minibuffer is used by other frames.
 Normally, you cannot delete a frame if all other frames are invisible,
@@ -1897,7 +1872,3 @@ This variable's value is @code{t} if no X window manager is in use.
 The functions @code{x-pixel-width} and @code{x-pixel-height} return the
 width and height of an X Window frame, measured in pixels.
 @end ignore
-@ignore
-   arch-tag: 94977df6-3dca-4730-b57b-c6329e9282ba
-@end ignore
diff --git a/lispref/front-cover-1.texi b/lispref/front-cover-1.texi
index 5c9f4351f42..56d0f2b1c2d 100644
--- a/lispref/front-cover-1.texi
+++ b/lispref/front-cover-1.texi
@@ -50,7 +50,3 @@
 @end titlepage
 @bye
-@ignore
-   arch-tag: 5182b306-c403-4e4f-ba24-e1911bc6da9d
-@end ignore
diff --git a/lispref/functions.texi b/lispref/functions.texi
index 48091772435..e6f50bf4168 100644
--- a/lispref/functions.texi
+++ b/lispref/functions.texi
@@ -1329,6 +1329,3 @@ See @ref{Mapping Functions}.
 See @ref{Key Lookup}.
 @end table
-@ignore
-   arch-tag: 39100cdf-8a55-4898-acba-595db619e8e2
-@end ignore
diff --git a/lispref/gpl.texi b/lispref/gpl.texi
index 433288e26d9..de21adbdd18 100644
--- a/lispref/gpl.texi
+++ b/lispref/gpl.texi
@@ -398,6 +398,3 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
-@ignore
-   arch-tag: d00ac830-e120-41fb-bbc5-7ca3eeaa227f
-@end ignore
diff --git a/lispref/hash.texi b/lispref/hash.texi
index c6bb9caac00..8d757a04798 100644
--- a/lispref/hash.texi
+++ b/lispref/hash.texi
@@ -334,7 +334,3 @@ This returns the rehash threshold of @var{table}.
 @defun hash-table-size table
 This returns the current nominal size of @var{table}.
 @end defun
-@ignore
-   arch-tag: 3b5107f9-d2f0-47d5-ad61-3498496bea0e
-@end ignore
diff --git a/lispref/help.texi b/lispref/help.texi
index 7675e38e81e..3f4f83b41c0 100644
--- a/lispref/help.texi
+++ b/lispref/help.texi
@@ -635,7 +635,3 @@ If this variable is non-@code{nil}, commands defined with
 echo area at first, and display the longer @var{help-text} strings only
 if the user types the help character again.
 @end defopt
-@ignore
-   arch-tag: ba36b4c2-e60f-49e2-bc25-61158fdcd815
-@end ignore
diff --git a/lispref/hooks.texi b/lispref/hooks.texi
index fde028a3d14..4c4e6d14c01 100644
--- a/lispref/hooks.texi
+++ b/lispref/hooks.texi
@@ -136,7 +136,3 @@ however, we have renamed all of those.)
 @item write-file-functions
 @item write-region-annotate-functions
 @end table
-@ignore
-   arch-tag: 55fd0296-d906-4551-b300-979d3846aa88
-@end ignore
diff --git a/lispref/index.perm b/lispref/index.perm
deleted file mode 100644
index 0b391e85379..00000000000
--- a/lispref/index.perm
+++ /dev/null
@@ -1,38 +0,0 @@
-@setfilename ../info/index
-@c Indexing guidelines
-@c I assume that all indexes will be combinded.
-@c Therefore, if a generated findex and permutations
-@c cover the ways an index user would look up the entry,
-@c then no cindex is added.
-@c Concept index (cindex) entries will also be permuted.  Therefore, they
-@c have no commas and few irrelevant connectives in them.
-@c I tried to include words in a cindex that give the context of the entry,
-@c particularly if there is more than one entry for the same concept.
-@c For example, "nil in keymap"
-@c Similarly for explicit findex and vindex entries, e.g., "print example".
-@c Error codes are given cindex entries, e.g., "end-of-file error".
-@c pindex is used for .el files and Unix programs
-@node Index, New Symbols, Standard Hooks, Top
-@unnumbered Index
-All variables, functions, keys, programs, files, and concepts are
-in this one index.
-All names and concepts are permuted, so they appear several times, one
-for each permutation of the parts of the name.  For example,
-@code{function-name} would appear as @b{function-name} and @b{name,
-function-}.
-@c Print the indices
-@printindex fn
diff --git a/lispref/index.unperm b/lispref/index.unperm
deleted file mode 100644
index 95c76e5a00c..00000000000
--- a/lispref/index.unperm
+++ /dev/null
@@ -1,29 +0,0 @@
-@c -*-texinfo-*-
-@setfilename ../info/index
-@c Indexing guidelines
-@c I assume that all indexes will be combinded.
-@c Therefore, if a generated findex and permutations
-@c cover the ways an index user would look up the entry,
-@c then no cindex is added.
-@c Concept index (cindex) entries will also be permuted.  Therefore, they
-@c have no commas and few irrelevant connectives in them.
-@c I tried to include words in a cindex that give the context of the entry,
-@c particularly if there is more than one entry for the same concept.
-@c For example, "nil in keymap"
-@c Similarly for explicit findex and vindex entries, e.g. "print example".
-@c Error codes are given cindex entries, e.g. "end-of-file error".
-@c pindex is used for .el files and Unix programs
-@node Index, New Symbols, Standard Hooks, Top
-@unnumbered Index
-@c Print the indices
-@printindex fn
diff --git a/lispref/internals.texi b/lispref/internals.texi
index 1810d0b9b9e..e5d6aedad22 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -1456,7 +1456,3 @@ Size of carryover in encoding.
 Flag to set @code{coding-system} of the process buffer from the
 coding system used to decode process output.
 @end table
-@ignore
-   arch-tag: 4b2c33bc-d7e4-43f5-bc20-27c0db52a53e
-@end ignore
diff --git a/lispref/intro.texi b/lispref/intro.texi
index 0ecc8f88513..35e8151922d 100644
--- a/lispref/intro.texi
+++ b/lispref/intro.texi
@@ -548,7 +548,3 @@ Francesco Potorti, Friedrich Pukelsheim, Arnold D. Robbins, Raul
 Rockwell, Per Starb@"ack, Shinichirou Sugou, Kimmo Suominen, Edward Tharp,
 Bill Trost, Rickard Westman, Jean White, Matthew Wilding, Carl Witty,
 Dale Worley, Rusty Wright, and David D. Zuhn.
-@ignore
-   arch-tag: d156593f-82f8-4708-a844-204e48f7f2aa
-@end ignore
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 826f90d5a05..b6170b3a8f0 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -28,7 +28,6 @@ found.  The whole process is called @dfn{key lookup}.
 * Key Lookup::                  How extracting elements from keymaps works.
 * Functions for Key Lookup::    How to request key lookup.
 * Changing Key Bindings::       Redefining a key in a keymap.
-* Remapping Commands::          Bindings that translate one command to another.
 * Key Binding Commands::        Interactive interfaces for redefining keys.
 * Scanning Keymaps::            Looking through all keymaps, for printing help.
 * Menu Keymaps::                Defining a menu as a keymap.
@@ -125,24 +124,27 @@ bindings allow a keymap to bind all possible event types without having
 to enumerate all of them.  A keymap that has a default binding
 completely masks any lower-precedence keymap.
-@item @var{char-table}
+@item @var{vector}
-If an element of a keymap is a char-table, it counts as holding
+If an element of a keymap is a vector, the vector counts as bindings for
-bindings for all character events with no modifier bits
+all the @sc{ascii} characters, codes 0 through 127; vector element
-(@pxref{modifier bits}): element @var{n} is the binding for the
+@var{n} is the binding for the character with code @var{n}.  This is a
-character with code @var{n}.  This is a compact way to record lots of
+compact way to record lots of bindings.  A keymap with such a vector is
-bindings.  A keymap with such a char-table is called a @dfn{full
+called a @dfn{full keymap}.  Other keymaps are called @dfn{sparse
-keymap}.  Other keymaps are called @dfn{sparse keymaps}.
+keymaps}.
-When a keymap contains a char-table vector, it always defines a
+A @code{nil} binding is used to mean that a key is explicitly not bound.
-binding for each character without modifiers.  However, if the binding
+Just like any other binding, it takes precedence over a default binding
-is @code{nil}, it doesn't constitute a definition.  @code{nil} takes
+or a binding in the parent keymap, but on the other hand, it does not
-precedence over a default binding or a binding in the parent keymap.
+take precedence over keymaps of lower priority.
-So in a full keymap, default bindings are not meaningful for
-characters without modifiers.  They can still apply to characters with
+When a keymap contains a vector, it always defines a binding for each
-modifier bits and to non-character events.  A binding of @code{nil}
+@sc{ascii} character, even if the vector contains @code{nil} for that
-does @emph{not} override lower-precedence keymaps; thus, if the local
+character.  Such a binding of @code{nil} overrides any default key
-map gives a binding of @code{nil}, Emacs uses the binding from the
+binding in the keymap, for @sc{ascii} characters.  However, default
-global map.
+bindings are still meaningful for events other than @sc{ascii}
+characters.  A binding of @code{nil} does @emph{not} override
+lower-precedence keymaps; thus, if the local map gives a binding of
+@code{nil}, Emacs uses the binding from the global map.
 @item @var{string}
 @cindex keymap prompt string
@@ -528,8 +530,7 @@ when the minor mode is enabled.
  The variable @code{overriding-local-map}, if non-@code{nil}, specifies
 another local keymap that overrides the buffer's local map and all the
-minor mode keymaps.  Modes for emulation can specify additional
+minor mode keymaps.
-active keymaps through the variable @code{emulation-mode-map-alists}.
  All the active keymaps are used together to determine what command to
 execute when a key is entered.  Emacs searches these maps one by one, in
@@ -713,16 +714,6 @@ binding in this keymap, then it is special, and the binding for the
 event is run directly by @code{read-event}.  @xref{Special Events}.
 @end defvar
-@defvar emulation-mode-map-alists
-This variable holds a list of keymap alists to use for emulations
-modes.  It is intended for modes or packages using multiple minor-mode
-keymaps.  Each element is a keymap alist which has the same format and
-meaning as @code{minor-mode-map-alist}, or a symbol with a variable
-binding which is such an alist.  The ``active'' keymaps in each alist
-are used before @code{minor-mode-map-alist} and
-@code{minor-mode-overriding-map-alist}.
-@end defvar
 @node Key Lookup
 @section Key Lookup
 @cindex key lookup
@@ -927,7 +918,7 @@ Used in keymaps to undefine keys.  It calls @code{ding}, but does
 not cause an error.
 @end deffn
-@defun key-binding key &optional accept-defaults no-remap
+@defun key-binding key &optional accept-defaults
 This function returns the binding for @var{key} in the current
 keymaps, trying all the active keymaps.  The result is @code{nil} if
 @var{key} is undefined in the keymaps.
@@ -936,12 +927,6 @@ keymaps, trying all the active keymaps.  The result is @code{nil} if
 The argument @var{accept-defaults} controls checking for default
 bindings, as in @code{lookup-key} (above).
-When commands are remapped (@pxref{Remapping Commands}),
-@code{key-binding} normally processes command remappings so as to
-returns the remapped command that will actually be executed.  However,
-if @var{no-remap} is non-@code{nil}, @code{key-binding} ignores
-remappings and returns the binding directly specified for @var{key}.
 An error is signaled if @var{key} is not a string or a vector.
 @example
@@ -1165,12 +1150,6 @@ changing an entry in @code{ctl-x-map}, and this has the effect of
 changing the bindings of both @kbd{C-p C-f} and @kbd{C-x C-f} in the
 default global map.
-  The function @code{substitute-key-definition} scans a keymap for
-keys that have a certain binding and rebind them with a different
-binding.  Another feature you can use for similar effects, but which
-is often cleaner, is to add a binding that remaps a command
-(@pxref{Remapping Commands}).
 @defun substitute-key-definition olddef newdef keymap &optional oldmap
 @cindex replace bindings
 This function replaces @var{olddef} with @var{newdef} for any keys in
@@ -1205,6 +1184,13 @@ bindings in another.  For example,
 puts the special deletion command in @code{my-map} for whichever keys
 are globally bound to the standard deletion command.
+@ignore
+@c Emacs 18 only
+Prefix keymaps that appear within @var{keymap} are not checked
+recursively for keys bound to @var{olddef}; they are not changed at all.
+Perhaps it would be better to check nested keymaps recursively.
+@end ignore
 Here is an example showing a keymap before and after substitution:
 @smallexample
@@ -1273,56 +1259,6 @@ Dired mode is set up:
 @end smallexample
 @end defun
-@node Remapping Commands
-@section Remapping Commands
-@cindex remapping commands
-  A special kind of key binding, using a special ``key sequence''
-which includes a command name, has the effect of @dfn{remapping} that
-command into another.  Here's how it works.  You make a key binding
-for a key sequence tha starts with the dummy event @code{remap},
-followed by the command name you want to remap.  Specify the remapped
-definition as the definition in this binding.  The remapped definition
-is usually a command name, but it can be any valid definition for
-a key binding.
-  Here's an example.  Suppose that My mode uses special commands
-@code{my-kill-line} and @code{my-kill-word}, which should be invoked
-instead of @code{kill-line} and @code{kill-word}.  It can establish
-this by making these two command-remapping bindings in its keymap:
-@example
-(define-key my-mode-map [remap kill-line] 'my-kill-line)
-(define-key my-mode-map [remap kill-word] 'my-kill-word)
-@end example
-Whenever @code{my-mode-map} is an active keymap, if the user types
-@kbd{C-k}, Emacs will find the standard global binding of
-@code{kill-line} (assuming nobody has changed it).  But
-@code{my-mode-map} remaps @code{kill-line} to @code{my-mode-map},
-so instead of running @code{kill-line}, Emacs runs
-@code{my-kill-line}.
-Remapping only works through a single level.  In other words,
-@example
-(define-key my-mode-map [remap kill-line] 'my-kill-line)
-(define-key my-mode-map [remap my-kill-line] 'my-other-kill-line)
-@end example
-@noindent
-does not have the effect of remapping @code{kill-line} into
-@code{my-other-kill-line}.  If an ordinary key binding specifies 
-@code{kill-line}, this keymap will remap it to @code{my-kill-line};
-if an ordinary binding specifies @code{my-kill-line}, this keymap will
-remap it to @code{my-other-kill-line}.
-@defun command-remapping command
-This function returns the remapping for @var{command}, given the
-current active keymaps.  If @var{command} is not remapped (which is
-the usual situation), the function returns @code{nil}.
-@end defun
 @node Key Binding Commands
 @section Commands for Binding Keys
@@ -1552,7 +1488,7 @@ This function is the cleanest way to examine all the bindings
 in a keymap.
 @end defun
-@defun where-is-internal command &optional keymap firstonly noindirect no-remap
+@defun where-is-internal command &optional keymap firstonly noindirect
 This function is a subroutine used by the @code{where-is} command
 (@pxref{Help, , Help, emacs,The GNU Emacs Manual}).  It returns a list
 of key sequences (of any length) that are bound to @var{command} in a
@@ -1583,13 +1519,6 @@ If @var{noindirect} is non-@code{nil}, @code{where-is-internal} doesn't
 follow indirect keymap bindings.  This makes it possible to search for
 an indirect definition itself.
-When command remapping is in effect (@pxref{Remapping Commands}),
-@code{where-is-internal} figures out when a command will be run due to
-remapping and reports keys accordingly.  It also returns @code{nil} if
-@var{command} won't really be run because it has been remapped to some
-other command.  However, if @var{no-remap} is non-@code{nil}.
-@code{where-is-internal} ignores remappings.
 @smallexample
 @group
 (where-is-internal 'describe-function)
@@ -2341,26 +2270,15 @@ To define items in some local map, bind @code{`tool-bar-map} with
 @defun tool-bar-add-item-from-menu command icon &optional map &rest props
 @tindex tool-bar-add-item-from-menu
-This function is a convenience for defining tool bar items which are
+This command is a convenience for defining tool bar items which are
 consistent with existing menu bar bindings.  The binding of
 @var{command} is looked up in the menu bar in @var{map} (default
 @code{global-map}) and modified to add an image specification for
-@var{icon}, which is found in the same way as by
+@var{icon}, which is looked for in the same way as by
 @code{tool-bar-add-item}.  The resulting binding is then placed in
-@code{tool-bar-map}, so use this function only for global tool bar
+@code{tool-bar-map}.  @var{map} must contain an appropriate keymap bound
-items.
+to @code{[menu-bar]}.  The remaining arguments @var{props} are
+additional property list elements to add to the menu item specification.
-@var{map} must contain an appropriate keymap bound to
-@code{[menu-bar]}.  The remaining arguments @var{props} are additional
-property list elements to add to the menu item specification.
-@end defun
-@defun tool-bar-local-item-from-menu command icon in-map &optional from-map &rest props
-This function is used for making non-global tool bar items.  Use it
-like @code{tool-bar-add-item-from-menu} except that @var{in-map}
-specifies the local map to make the definition in.  The argument
-@var{from-map} si like the @var{map} argument of
-@code{tool-bar-add-item-from-menu}.
 @end defun
 @tindex auto-resize-tool-bar
@@ -2453,7 +2371,3 @@ menu of Shell mode, after the item @code{break}:
  [work] '("Work" . work-command) 'break)
 @end example
 @end defun
-@ignore
-   arch-tag: cfb87287-9364-4e46-9e93-6c2f7f6ae794
-@end ignore
diff --git a/lispref/lay-flat.texi b/lispref/lay-flat.texi
index c77962456ed..0b0b2b6a566 100644
--- a/lispref/lay-flat.texi
+++ b/lispref/lay-flat.texi
@@ -37,7 +37,3 @@ pushed or held down.
 @end tex
 @bye
-@ignore
-   arch-tag: 9e03a1c7-6f62-4346-85d9-ed5b79386e07
-@end ignore
diff --git a/lispref/lists.texi b/lispref/lists.texi
index e68d1658a8b..f332f13040d 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -1668,7 +1668,3 @@ of @var{alist}.
     @result{} ((bar 2) (lose 4))
 @end example
 @end defun
-@ignore
-   arch-tag: 31fb8a4e-4aa8-4a74-a206-aa00451394d4
-@end ignore
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 752f0bcf7a4..97cddfd8dff 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -852,7 +852,3 @@ implement @code{eval-after-load}.
 @end defvar
 @c Emacs 19 feature
-@ignore
-   arch-tag: df731f89-0900-4389-a436-9105241b6f7a
-@end ignore
diff --git a/lispref/locals.texi b/lispref/locals.texi
index 8a7a1387710..6d998dabdf6 100644
--- a/lispref/locals.texi
+++ b/lispref/locals.texi
@@ -174,7 +174,3 @@ Used for communication between mouse commands and scroll-bar commands.
 @item vc-mode
 @xref{Mode Line Variables}.
 @end table
-@ignore
-   arch-tag: 6baae835-b667-4447-91e2-9829ae1cf543
-@end ignore
diff --git a/lispref/macros.texi b/lispref/macros.texi
index b28797b06c9..3c91e5bb317 100644
--- a/lispref/macros.texi
+++ b/lispref/macros.texi
@@ -30,7 +30,6 @@ instead.  @xref{Inline Functions}.
 * Backquote::               Easier construction of list structure.
 * Problems with Macros::    Don't evaluate the macro arguments too many times.
                              Don't hide the user's variables.
-* Indenting Macros::        Specifying how to indent macro calls.
 @end menu
 @node Simple Macro
@@ -206,30 +205,6 @@ any @code{interactive} declaration is ignored since macros cannot be
 called interactively.
 @end defspec
-  The body of the macro definition can include a @code{declare} form,
-which can specify how @key{TAB} should indent macro calls, and how to
-step through them for Edebug.
-@defspec declare @var{specs}...
-This special form is used at top level in a macro definition to
-specify various additional information about it.  Two kinds of
-specification are currently supported:
-@table @code
-@item (edebug @var{edebug-form-spec})
-Specify how to step through macro calls for Edebug.
-@xref{Instrumenting Macro Calls}, for more details.
-@item (indent @var{indent-spec})
-Specify how to indent calls to this macro.  @xref{Indenting Macros},
-for more details.
-@end table
-@end defspec
-  No macro absolutely needs a @code{declare} form, because that form
-has no effect on how the macro expands, on what the macro means in the
-program.  It only affects secondary features: indentation and Edebug.
 @node Backquote
 @section Backquote
 @cindex backquote (list substitution)
@@ -661,62 +636,3 @@ One way to avoid pathological cases like this is to think of
 allocation construct.  You wouldn't use @code{setcar} on a constant such
 as @code{'(nil)}, so naturally you won't use it on @code{(empty-object)}
 either.
-@node Indenting Macros
-@section Indenting Macros
-  You can use the @code{declare} form in the macro definition to
-specify how to @key{TAB} should indent indent calls to the macro.  You
-write it like this:
-@example
-(declare (indent @var{indent-spec}))
-@end example
-@noindent
-Here are the possibilities for @var{indent-spec}:
-@table @asis
-@item @code{nil}
-This is the same as no property---use the standard indentation pattern.
-@item @code{defun}
-Handle this function like a @samp{def} construct: treat the second
-line as the start of a @dfn{body}.
-@item a number, @var{number}
-The first @var{number} arguments of the function are
-@dfn{distinguished} arguments; the rest are considered the body
-of the expression.  A line in the expression is indented according to
-whether the first argument on it is distinguished or not.  If the
-argument is part of the body, the line is indented @code{lisp-body-indent}
-more columns than the open-parenthesis starting the containing
-expression.  If the argument is distinguished and is either the first
-or second argument, it is indented @emph{twice} that many extra columns.
-If the argument is distinguished and not the first or second argument,
-the line uses the standard pattern.
-@item a symbol, @var{symbol}
-@var{symbol} should be a function name; that function is called to
-calculate the indentation of a line within this expression.  The
-function receives two arguments:
-@table @asis
-@item @var{state}
-The value returned by @code{parse-partial-sexp} (a Lisp primitive for
-indentation and nesting computation) when it parses up to the
-beginning of this line.
-@item @var{pos}
-The position at which the line being indented begins.
-@end table
-@noindent
-It should return either a number, which is the number of columns of
-indentation for that line, or a list whose car is such a number.  The
-difference between returning a number and returning a list is that a
-number says that all following lines at the same nesting level should
-be indented just like this one; a list says that following lines might
-call for different indentations.  This makes a difference when the
-indentation is being computed by @kbd{C-M-q}; if the value is a
-number, @kbd{C-M-q} need not recalculate indentation for the following
-lines until the end of the list.
-@end table
-@ignore
-   arch-tag: d4cce66d-1047-45c3-bfde-db6719d6e82b
-@end ignore
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
deleted file mode 100644
index 8cb9aa83330..00000000000
--- a/lispref/makefile.w32-in
+++ /dev/null
@@ -1,140 +0,0 @@
-# Makefile for the GNU Emacs Lisp Reference Manual.
-# Copyright (C) 2003
-#  Free Software Foundation, Inc.
-# This file is part of GNU Emacs.
-# GNU Emacs is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-# Standard configure variables.
-srcdir = .
-infodir = $(srcdir)/../info
-# Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
-# TEX=platex
-TEX=tex
-INSTALL_INFO = install-info
-MAKEINFO = makeinfo
-# The environment variable and its value to add $(srcdir) to the path
-# searched for TeX input files.
-texinputdir = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
-# The name of the manual:
-VERSION=2.9
-manual = elisp-manual-21-$(VERSION)
-# Uncomment this line for permuted index.
-# permuted_index = 1 
-# List of all the texinfo files in the manual:
-srcs = \
-  $(srcdir)/abbrevs.texi \
-  $(srcdir)/advice.texi \
-  $(srcdir)/anti.texi \
-  $(srcdir)/back.texi \
-  $(srcdir)/backups.texi \
-  $(srcdir)/buffers.texi \
-  $(srcdir)/calendar.texi \
-  $(srcdir)/commands.texi \
-  $(srcdir)/compile.texi \
-  $(srcdir)/control.texi \
-  $(srcdir)/customize.texi \
-  $(srcdir)/debugging.texi \
-  $(srcdir)/display.texi \
-  $(srcdir)/edebug.texi \
-  $(srcdir)/elisp.texi \
-  $(srcdir)/errors.texi \
-  $(srcdir)/eval.texi \
-  $(srcdir)/files.texi \
-  $(srcdir)/frames.texi \
-  $(srcdir)/functions.texi \
-  $(srcdir)/hash.texi \
-  $(srcdir)/help.texi \
-  $(srcdir)/hooks.texi \
-  $(srcdir)/internals.texi \
-  $(srcdir)/intro.texi \
-  $(srcdir)/keymaps.texi \
-  $(srcdir)/lists.texi \
-  $(srcdir)/loading.texi \
-  $(srcdir)/locals.texi \
-  $(srcdir)/macros.texi \
-  $(srcdir)/maps.texi \
-  $(srcdir)/markers.texi \
-  $(srcdir)/minibuf.texi \
-  $(srcdir)/modes.texi \
-  $(srcdir)/nonascii.texi \
-  $(srcdir)/numbers.texi \
-  $(srcdir)/objects.texi \
-  $(srcdir)/os.texi \
-  $(srcdir)/positions.texi \
-  $(srcdir)/processes.texi \
-  $(srcdir)/searching.texi \
-  $(srcdir)/sequences.texi \
-  $(srcdir)/streams.texi \
-  $(srcdir)/strings.texi \
-  $(srcdir)/symbols.texi \
-  $(srcdir)/syntax.texi \
-  $(srcdir)/text.texi \
-  $(srcdir)/tips.texi \
-  $(srcdir)/variables.texi \
-  $(srcdir)/windows.texi \
-  $(srcdir)/index.unperm \
-  $(srcdir)/index.perm \
-  $(srcdir)/gpl.texi \
-  $(srcdir)/doclicense.texi
-.PHONY: clean
-# The info file is named `elisp'.
-info: $(infodir)/elisp
-        $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
-$(infodir)/elisp: $(srcs) index.texi
-        $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
-elisp.dvi: $(srcs) index.texi
-#       Avoid losing old contents of aux file entirely.
-        -ren elisp.aux elisp.oaux
-#       First shot to define xrefs.
-        $(texinputdir) $(TEX) $(srcdir)/elisp.texi
-        if not a$(permuted_index) == a  sh $(srcdir)/permute-index
-        if not a$(permuted_index) == a  ren permuted.fns elisp.fns
-        if not a$(permuted_index) == a  texindex elisp.tp
-        if a$(permuted_index) == a  texindex elisp.??
-        $(texinputdir) $(TEX) $(srcdir)/elisp.texi
-index.texi:
-        if a$(permuted_index) == a  cp $(srcdir)/index.unperm index.texi
-        if not a$(permuted_index) == a  cp $(srcdir)/index.perm index.texi
-clean:
-        rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
-              *.vr *.vrs *.pg *.pgs *.ky *.kys
-        rm -f make.out core 
-        rm -f index.texi
-        rm -f $(infodir)/elisp*
-distclean: clean
-maintainer-clean: clean
-        rm -f elisp elisp-* elisp.dvi elisp.oaux
-# arch-tag: da68f1c2-536d-4d41-9150-7b01434eda3f
diff --git a/lispref/maps.texi b/lispref/maps.texi
index 16c1f0bab9b..8a529e81d2f 100644
--- a/lispref/maps.texi
+++ b/lispref/maps.texi
@@ -187,7 +187,3 @@ A sparse keymap used by Text mode.
 @vindex view-mode-map
 A full keymap used by View mode.
 @end table
-@ignore
-   arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
-@end ignore
diff --git a/lispref/markers.texi b/lispref/markers.texi
index e50dacd8829..dec9396a787 100644
--- a/lispref/markers.texi
+++ b/lispref/markers.texi
@@ -639,7 +639,3 @@ should normally use @code{interactive} with the @samp{r} specification
 to find the beginning and end of the region.  This lets other Lisp
 programs specify the bounds explicitly as arguments.  (@xref{Interactive
 Codes}.)
-@ignore
-   arch-tag: b1ba2e7a-a0f3-4c5e-875c-7d8e22d73299
-@end ignore
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index 44161c0178d..573191c6781 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -1083,7 +1083,7 @@ predicate @code{user-variable-p} instead of @code{commandp}:
 file name.  It provides special features including automatic insertion
 of the default directory.
-@defun read-file-name prompt &optional directory default existing initial predicate
+@defun read-file-name prompt &optional directory default existing initial
 This function reads a file name in the minibuffer, prompting with
 @var{prompt} and providing completion.  If @var{default} is
 non-@code{nil}, then the function returns @var{default} if the user just
@@ -1112,11 +1112,6 @@ case, point goes at the beginning of @var{initial}.  The default for
 @var{initial} does, try the command @kbd{C-x C-v}.  @strong{Note:} we
 recommend using @var{default} rather than @var{initial} in most cases.
-If @var{predicate} is non-@code{nil}, it specifies a function of one
-argument that decides which file names are acceptable completion
-possibilities.  A file name is an acceptable value if @var{predicate}
-returns non-@code{nil} for it.
 Here is an example:
 @example
@@ -1151,11 +1146,6 @@ If the user types @key{RET}, @code{read-file-name} returns the file name
 as the string @code{"/gp/gnu/elisp/manual.texi"}.
 @end defun
-@defun read-directory-name prompt &optional directory default existing initial
-This function is like @code{read-file-name} but allows only directory
-names as completion possibilities.
-@end defun
 @defopt insert-default-directory
 This variable is used by @code{read-file-name}.  Its value controls
 whether @code{read-file-name} starts by placing the name of the default
@@ -1693,7 +1683,3 @@ This function displays @var{string} temporarily at the end of the
 minibuffer text, for @var{timeout} seconds.  (The default is 2
 seconds.)
 @end defun
-@ignore
-   arch-tag: bba7f945-9078-477f-a2ce-18818a6e1218
-@end ignore
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 1272d8cc5c8..25f44b92e09 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -4,7 +4,7 @@
 @c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/modes
-@node Modes, Documentation, Keymaps, Top
+@node Modes, Documentation,  Keymaps, Top
 @chapter Major and Minor Modes
 @cindex mode
@@ -1161,7 +1161,6 @@ actually appears.
 * %-Constructs::          Putting information into a mode line.
 * Properties in Mode::    Using text properties in the mode line.
 * Header Lines::          Like a mode line, but at the top.
-* Emulating Mode Line::   Formatting text as the mode line would.
 @end menu
 @node Mode Line Data
@@ -1611,31 +1610,6 @@ that do not override it.  This is the same as @code{(default-value
 It is normally @code{nil}, so that ordinary buffers have no header line.
 @end defvar
-@node Emulating Mode Line
-@subsection Emulating Mode Line Formatting
-  You can use the function @code{format-mode-line} to compute
-the text that would appear in a mode line or header line
-based on certain mode line specification.
-@defun format-mode-line &optional format window no-props
-This function formats a line of text according to @var{format} as if
-it were generating the mode line for @var{window}, but instead of
-displaying the text in the mode line or the header line, it returns
-the text as a string.
-If @var{format} is @code{nil}, that means to use
-@code{mode-line-format} and return the text that would appear in the
-mode line.  If @var{format} is @code{t}, that means to use
-@code{header-line-format} so as to return the text that would appear
-in the header line (@code{""} if the window has no header line).
-The argument @var{window} defaults to the selected window.
-The value string normally has text properties that correspond to the
-faces, keymaps, etc., that the mode line would have.  If
-@var{no-props} is non-@code{nil}, the value has no text properties.
-@end defun
 @node Imenu
 @section Imenu
@@ -1996,14 +1970,13 @@ of the match to fontify (0 means the entire matching text).  The second
 subelement, @var{facename}, specifies the face, as described above.
 The last two values in @var{highlighter}, @var{override} and
-@var{laxmatch}, are flags.  If @var{override} is @code{t}, this
+@var{laxmatch}, are flags.  If @var{override} is @code{t}, this element
-element can override existing fontification made by previous elements
+can override existing fontification made by previous elements of
-of @code{font-lock-keywords}.  If it is @code{keep}, then each
+@code{font-lock-keywords}.  If it is @code{keep}, then each character is
-character is fontified if it has not been fontified already by some
+fontified if it has not been fontified already by some other element.
-other element.  If it is @code{prepend}, the face @var{facename} is
+If it is @code{prepend}, the face @var{facename} is added to the
-added to the beginning of the @code{font-lock-face} property.  If it
+beginning of the @code{face} property.  If it is @code{append}, the face
-is @code{append}, the face @var{facename} is added to the end of the
+@var{facename} is added to the end of the @code{face} property.
-@code{font-lock-face} property.
 If @var{laxmatch} is non-@code{nil}, it means there should be no error
 if there is no subexpression numbered @var{subexp} in @var{matcher}.
@@ -2159,11 +2132,11 @@ textual modes.
 @end defvar
 @defvar font-lock-extra-managed-props
-Additional properties (other than @code{font-lock-face}) that are
+Additional properties (other than @code{face}) that are being managed
-being managed by Font Lock mode.  Font Lock mode normally manages only
+by Font Lock mode.  Font Lock mode normally manages only the @code{face}
-the @code{font-lock-face} property; if you want it to manage others as
+property; if you want it to manage others as well, you must specify
-well, you must specify them in a @var{facename} in
+them in a @var{facename} in @code{font-lock-keywords} as well as adding
-@code{font-lock-keywords} as well as adding them to this list.
+them to this list.
 @end defvar
 @node Levels of Font Lock
@@ -2491,7 +2464,3 @@ This function removes @var{function} from the hook variable @var{hook}.
 If @var{local} is non-@code{nil}, that says to remove @var{function}
 from the buffer-local hook list instead of from the global hook list.
 @end defun
-@ignore
-   arch-tag: 4c7bff41-36e6-4da6-9e7f-9b9289e27c8e
-@end ignore
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 769e13d5342..12f3afd5f4d 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -1301,7 +1301,3 @@ strings in the return value are decoded using
 @code{locale-coding-system}.  @xref{Locales,,, libc, GNU Libc Manual},
 for more information about locales and locale items.
 @end defun
-@ignore
-   arch-tag: be705bf8-941b-4c35-84fc-ad7d20ddb7cb
-@end ignore
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index e2cfc937c4d..e233a9f1d9f 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -1180,7 +1180,3 @@ On some machines, any integer representable in Lisp may be the result
 of @code{random}.  On other machines, the result can never be larger
 than a certain maximum or less than a certain (negative) minimum.
 @end defun
-@ignore
-   arch-tag: 574e8dd2-d513-4616-9844-c9a27869782e
-@end ignore
diff --git a/lispref/objects.texi b/lispref/objects.texi
index c343bac4829..309071920d8 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -409,8 +409,7 @@ represents the shifted-control-o character.
 @cindex hyper characters
 @cindex super characters
 @cindex alt characters
-  The X Window System defines three other @anchor{modifier bits}
+  The X Window System defines three other modifier bits that can be set
-modifier bits that can be set
 in a character: @dfn{hyper}, @dfn{super} and @dfn{alt}.  The syntaxes
 for these bits are @samp{\H-}, @samp{\s-} and @samp{\A-}.  (Case is
 significant in these prefixes.)  Thus, @samp{?\H-\M-\A-x} represents
@@ -1903,7 +1902,3 @@ returns @code{t} if and only if both the expressions below return
 Because of this recursive method, circular lists may therefore cause
 infinite recursion (leading to an error).
-@ignore
-   arch-tag: 9711a66e-4749-4265-9e8c-972d55b67096
-@end ignore
diff --git a/lispref/os.texi b/lispref/os.texi
index a92f550b556..3536c086f1f 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1233,8 +1233,6 @@ arguments; for example, day 0 means the day preceding the given month.
 The operating system puts limits on the range of possible time values;
 if you try to encode a time that is out of range, an error results.
-For instance, years before 1970 do not work on some systems;
-on others, years as early as 1901 do work.
 @end defun
 @node Time Calculations
@@ -2075,7 +2073,3 @@ Emacs is restarted by the session manager.
  nil)
 @end group
 @end example
-@ignore
-   arch-tag: 8378814a-30d7-467c-9615-74a80b9988a7
-@end ignore
diff --git a/lispref/permute-index b/lispref/permute-index
deleted file mode 100644
index bbe2be75cba..00000000000
--- a/lispref/permute-index
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-# Generate a permuted index of all names.
-# The result is a file called index.fns.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-#
-# This file is part of GNU Emacs.
-#
-# GNU Emacs is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-# You will need to modify this for your needs.
-set TEXINDEX=texindex  # path to texindex command
-#set EMACS=gnuemacs     # your emacs command
-#set TEX=tex             # your tex command
-set MANUAL=elisp  # the base name of the manual
-# goto 3
-1:
-echo "Extract raw index from texinfo fn index."
-# Let texindex combine duplicate entries, later.
-# But it wants to protect non-alphanumerics thus confusing ptx.
-# Also change `\ ' to just a ` ', since texindex will fail. This is produced
-# by `@findex two words' in an example environment (no doubt among others).
-# delete wrapper parens
-# change dots {} to dots{}
-# change {-} to char form, so ptx wont ignore it.
-# delete leading \entry {
-# change '\ ' to ' '
-# change lines with = < > since they mess up field extraction.
-# separate into fields delimited by "
-rm -f permuted.raw
-cat ${MANUAL}.fn | \
-        sed \
-        -e 's/(\([^)]*\))/\1/' \
-        -e 's/\\dots {}/(\\dots{})/' \
-        -e "s/{-}/{{\\tt\\char'055}}/" \
-        -e 's,^[^ ]* {,,' \
-        -e 's, },},' \
-        -e 's,\\ , ,g' \
-        -e 's/{\\tt\\char61}/=/' \
-        -e 's/{\\tt\\gtr}/>/' \
-        -e 's/{\\tt\\less}/</' \
-        -e 's/}{/"/g' \
-        | awk -F\" '{print $2, $1}' > permuted.raw
-2:
-# Build break file for ptx.
-cat <<EOF > permuted.break
-
-:
-EOF
-# Build the ignore file for ptx.
-# We would like to ignore "and", "or", and "for",
-# but ptx ignores ignore words even if they stand alone.
-cat <<EOF > permuted.ignore
-the
-in
-to
-as
-a
-an
-of
-on
-them
-how
-from
-by
-EOF
-echo "Make troff permuted index."
-rm -f permuted.t
-ptx -i permuted.ignore -b permuted.break -f -r -w 144 \
-         < permuted.raw > permuted.t
-3:
-echo "Extract the desired fields."
-rm -f permuted.fields
-awk -F\" '{printf "%s\"%s\"%s\n", $4,$6,$9}' permuted.t > permuted.fields
-4:
-echo "Format for texindex."
-# delete lines that start with "and ", "for "
-sed     < permuted.fields \
-        -e 's/=/{\\tt\\char61}/' \
-        -e 's/>/{\\tt\\gtr}/' \
-        -e 's/</{\\tt\\less}/' \
-        -e '/"and /d' \
-        -e '/"for /d' \
-  | awk -F\" 'NF>0 {if ($1=="") {\
-          print "\entry {" $2 "}{" 0+$3 "}{" $2 "}" }\
-        else {\
-          print "\entry {" $2 ", " $1 "}{" 0+$3 "}{" $2 ", " $1 "}"} }'\
-              > permuted.fn
-5:
-echo "Sort with texindex."
-${TEXINDEX} permuted.fn
-#mv permuted.fns ${MANUAL}.fns
-# The resulting permuted.fns will be read when we run TeX
-# on the manual the second time.  Or you can use permuted.texinfo here.
-#${TEX} permuted.texinfo
-6:
-echo "Clean up."
-rm -f permuted.fields permuted.t permuted.raw
-rm -f permuted.break permuted.ignore permuted.fn
diff --git a/lispref/positions.texi b/lispref/positions.texi
index 6248d4d651d..66085188c5b 100644
--- a/lispref/positions.texi
+++ b/lispref/positions.texi
@@ -996,7 +996,3 @@ This is the contents of foo@point{}
 @end group
 @end example
 @end defspec
-@ignore
-   arch-tag: 56e8ff26-4ffe-4832-a141-7e991a2d0f87
-@end ignore
diff --git a/lispref/processes.texi b/lispref/processes.texi
index b21cceb81b0..1794f218135 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1469,7 +1469,3 @@ The arguments @var{host} and @var{service} specify where to connect to;
 @var{host} is the host name (a string), and @var{service} is the name of
 a defined network service (a string) or a port number (an integer).
 @end defun
-@ignore
-   arch-tag: ba9da253-e65f-4e7f-b727-08fba0a1df7a
-@end ignore
diff --git a/lispref/searching.texi b/lispref/searching.texi
index f26831f6afd..82f380b18ed 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -1620,7 +1620,3 @@ spaces or new lines.
 For a detailed explanation of this regular expression, see @ref{Regexp
 Example}.
 @end defvar
-@ignore
-   arch-tag: c2573ca2-18aa-4839-93b8-924043ef831f
-@end ignore
diff --git a/lispref/sequences.texi b/lispref/sequences.texi
index e4503dd821f..8e7ab4176e2 100644
--- a/lispref/sequences.texi
+++ b/lispref/sequences.texi
@@ -489,11 +489,14 @@ The @code{vconcat} function also allows byte-code function objects as
 arguments.  This is a special feature to make it easy to access the entire
 contents of a byte-code function object.  @xref{Byte-Code Objects}.
-In Emacs versions before 21, the @code{vconcat} function allowed
+The @code{vconcat} function also allows integers as arguments.  It
-integers as arguments, converting them to strings of digits, but that
+converts them to strings of digits, making up the decimal print
-feature has been eliminated.  The proper way to convert an integer to
+representation of the integer, and then uses the strings instead of the
-a decimal number in this way is with @code{format} (@pxref{Formatting
+original integers.  @strong{Don't use this feature; we plan to eliminate
-Strings}) or @code{number-to-string} (@pxref{String Conversion}).
+it.  If you already use this feature, change your programs now!}  The
+proper way to convert an integer to a decimal number in this way is with
+@code{format} (@pxref{Formatting Strings}) or @code{number-to-string}
+(@pxref{String Conversion}).
 For other concatenation functions, see @code{mapconcat} in @ref{Mapping
 Functions}, @code{concat} in @ref{Creating Strings}, and @code{append}
@@ -719,6 +722,3 @@ bv
 These results make sense because the binary codes for control-_ and
 control-W are 11111 and 10111, respectively.
-@ignore
-   arch-tag: fcf1084a-cd29-4adc-9f16-68586935b386
-@end ignore
diff --git a/lispref/streams.texi b/lispref/streams.texi
index 77c82627963..bcddb742212 100644
--- a/lispref/streams.texi
+++ b/lispref/streams.texi
@@ -771,14 +771,6 @@ exceeding this limit is abbreviated with an ellipsis.  A value of
 @code{nil} (which is the default) means no limit.
 @end defvar
-@defopt eval-expression-print-length
-@defoptx eval-expression-print-level
-These are the values for @code{print-length} and @code{print-level}
-used by @code{eval-expression}, and thus, indirectly, by many
-interactive evaluation commands (@pxref{Lisp Eval,, Evaluating
-Emacs-Lisp Expressions, emacs, The GNU Emacs Manual}).
-@end defopt
  These variables are used for detecting and reporting circular
 and shared structure---but they are only defined in Emacs 21.
@@ -811,7 +803,3 @@ This variable holds a vector used internally by printing to implement
 the @code{print-circle} feature.  You should not use it except
 to bind it to @code{nil} when you bind @code{print-continuous-numbering}.
 @end defvar
-@ignore
-   arch-tag: 07636b8c-c4e3-4735-9e06-2e864320b434
-@end ignore
diff --git a/lispref/strings.texi b/lispref/strings.texi
index b0cc45a38b5..681e76daea9 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -255,7 +255,7 @@ printed form is with @code{format} (@pxref{Formatting Strings}) or
 For information about other concatenation functions, see the
 description of @code{mapconcat} in @ref{Mapping Functions},
-@code{vconcat} in @ref{Vector Functions}, and @code{append} in @ref{Building
+@code{vconcat} in @ref{Vectors}, and @code{append} in @ref{Building
 Lists}.
 @end defun
@@ -1007,7 +1007,3 @@ This function makes @var{char} case-invariant, with syntax
 This command displays a description of the contents of the current
 buffer's case table.
 @end deffn
-@ignore
-   arch-tag: 700b8e95-7aa5-4b52-9eb3-8f2e1ea152b4
-@end ignore
diff --git a/lispref/symbols.texi b/lispref/symbols.texi
index 6542d4b3d9f..ae4dffec89c 100644
--- a/lispref/symbols.texi
+++ b/lispref/symbols.texi
@@ -560,16 +560,6 @@ in the place where you got @var{plist}.  For example,
            (plist-put (symbol-plist symbol) prop value)))
 @end example
-@defun lax-plist-get plist property
-Like @code{plist-get} except that it compares properties
-using @code{equal} instead of @code{eq}.
-@end defun
-@defun lax-plist-put plist property value
-Like @code{plist-put} except that it compares properties
-using @code{equal} instead of @code{eq}.
-@end defun
 @defun plist-member plist property
 @tindex plist-member
 This returns non-@code{nil} if @var{plist} contains the given
@@ -578,7 +568,3 @@ between a missing property and a property with the value @code{nil}.
 The value is actually the tail of @var{plist} whose @code{car} is
 @var{property}.
 @end defun
-@ignore
-   arch-tag: 8750b7d2-de4c-4923-809a-d35fc39fd8ce
-@end ignore
diff --git a/lispref/syntax.texi b/lispref/syntax.texi
index b9ac26188d7..80d3a2f6c81 100644
--- a/lispref/syntax.texi
+++ b/lispref/syntax.texi
@@ -1061,7 +1061,3 @@ This function describes the category specifications in the current
 category table.  The descriptions are inserted in a buffer, which is
 then displayed.
 @end deffn
-@ignore
-   arch-tag: 4d914e96-0283-445c-9233-75d33662908c
-@end ignore
diff --git a/lispref/text.texi b/lispref/text.texi
index 3016e3c93d7..3197a72c8d7 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -58,7 +58,6 @@ the character after point.
                       position stored in a register.
 * Base 64::          Conversion to or from base 64 encoding.
 * MD5 Checksum::     Compute the MD5 ``message digest''/``checksum''.
-* Atomic Changes::   Installing several buffer changs ``atomically''.
 * Change Hooks::     Supplying functions to be run when text is changed.
 @end menu
@@ -399,11 +398,6 @@ We hold these truth@point{}
 @end example
 @end defun
-@defun insert-buffer-substring-no-properties from-buffer-or-name &optional start end
-This is like @code{insert-buffer-substring} except that it does not
-copy any text properties.
-@end defun
  @xref{Sticky Properties}, for other insertion functions that inherit
 text properties from the nearby text in addition to inserting it.
 Whitespace inserted by indentation functions also inherits text
@@ -767,7 +761,6 @@ would be difficult to change the terminology now.
 @menu
 * Kill Ring Concepts::     What text looks like in the kill ring.
 * Kill Functions::         Functions that kill text.
-* Yanking::                How yanking is done.
 * Yank Commands::          Commands that access the kill ring.
 * Low-Level Kill Ring::    Functions and variables for kill ring access.
 * Internals of Kill Ring:: Variables that hold kill-ring data.
@@ -812,7 +805,7 @@ adds it to the most recent element.  It determines automatically (using
 @code{last-command}) whether the previous command was a kill command,
 and if so appends the killed text to the most recent entry.
-@deffn Command kill-region start end &optional yank-handler
+@deffn Command kill-region start end
 This function kills the text in the region defined by @var{start} and
 @var{end}.  The text is deleted but saved in the kill ring, along with
 its text properties.  The value is always @code{nil}.
@@ -825,10 +818,6 @@ If the buffer or text is read-only, @code{kill-region} modifies the kill
 ring just the same, then signals an error without modifying the buffer.
 This is convenient because it lets the user use a series of kill
 commands to copy text from a read-only buffer into the kill ring.
-If @var{yank-handler} is non-@code{nil}, this puts that value onto
-the string of killed text, as a @code{yank-handler} property.
-@xref{Yanking}.
 @end deffn
 @defopt kill-read-only-ok
@@ -853,67 +842,6 @@ support Emacs 18.  For newer Emacs versions, it is better to use
 Ring}.
 @end deffn
-@node Yanking
-@subsection Yanking
-  Yanking means inserting text from the kill ring, but it does
-not insert the text blindly.  Yank commands and some other commands
-use @code{insert-for-yank} to perform special processing on the
-text that they copy into the buffer.
-@defun insert-for-yank string
-This function normally works like @code{insert} except that it doesn't
-insert the text properties in the @code{yank-excluded-properties}
-list.  However, if the first character of @var{string} has a
-non-@code{nil}@code{yank-handler} text property, that property
-can do various special processing on the text being inserted.
-@end defun
-@defun insert-buffer-substring-as-yank buf &optional start end
-This function resembles @code{insert-buffer-substring} except that it
-doesn't insert the text properties in the
-@code{yank-excluded-properties} list.
-@end defun
-  You can put a @code{yank-handler} text property on the text to
-control how it will be inserted if it is yanked.  The
-@code{insert-for-yank} function looks for a @code{yank-handler}
-property on the first character in its @var{string} argument.  The
-property value must be a list of one to four elements, with the
-following format (where elements after the first may be omitted):
-@example
-(@var{function} @var{param} @var{noexclude} @var{undo})
-@end example
-  Here is what the elements do:
-@table @var
-@item function
-When @var{function} is present and non-nil, it is called instead of
-@code{insert} to insert the string.  @var{function} takes one
-argument---the string to insert.
-@item param
-If @var{param} is present and non-@code{nil}, it replaces @var{string}
-as the object passed to @var{function} (or @code{insert}); for
-example, if @var{function} is @code{yank-rectangle}, @var{param}
-should be a list of strings to insert as a rectangle.
-@item noexclude
-If @var{noexclude} is present and non-@code{nil}, the normal removal of the
-yank-excluded-properties is not performed; instead @var{function} is
-responsible for removing those properties.  This may be necessary
-if @var{function} adjusts point before or after inserting the object.
-@item undo
-If @var{undo} is present and non-nil, it is a function that will be
-called by @code{yank-pop} to undo the insertion of the current object.
-It is called with two arguments, the start and end of the current
-region.  @var{function} can set @code{yank-undo-function} to override
-the @var{undo} value.
-@end table
 @node Yank Commands
 @comment  node-name,  next,  previous,  up
 @subsection Functions for Yanking
@@ -961,17 +889,6 @@ oldest.
 The return value is always @code{nil}.
 @end deffn
-@defvar yank-undo-function
-If this variable is non-@code{nil}, the function @code{yank-pop} uses
-its value instead of @code{delete-region} to delete the text
-inserted by the previous @code{yank} or
-@code{yank-pop} command.
-The function @code{insert-for-yank} automatically sets this variable
-according to the @var{undo} element of the @code{yank-handler}
-text property, if there is one.
-@end defvar
 @node Low-Level Kill Ring
 @subsection Low-Level Kill Ring
@@ -995,23 +912,19 @@ If @var{n} is zero, indicating a request for the latest kill,
 the kill ring.
 @end defun
-@defun kill-new string &optional yank-handler
+@defun kill-new string
 This function puts the text @var{string} into the kill ring as a new
 entry at the front of the ring.  It discards the oldest entry if
 appropriate.  It also invokes the value of
 @code{interprogram-cut-function} (see below).
-If @var{yank-handler} is non-@code{nil}, this puts that value onto
-the string of killed text, as a @code{yank-handler} property.
-@xref{Yanking}.
 @end defun
-@defun kill-append string before-p &optional yank-handler
+@defun kill-append string before-p
 This function appends the text @var{string} to the first entry in the
 kill ring.  Normally @var{string} goes at the end of the entry, but if
 @var{before-p} is non-@code{nil}, it goes at the beginning.  This
 function also invokes the value of @code{interprogram-cut-function} (see
-below).  This handles @var{yank-handler} just like @code{kill-new}.
+below).
 @end defun
 @defvar interprogram-paste-function
@@ -2522,12 +2435,6 @@ To remove all text properties from certain text, use
 list.
 @end defun
-@defun remove-list-of-text-properties start end list-of-properties &optional object
-Like @code{remove-list-properties} except that
-@var{list-of-properties} is a list property names only, not an
-alternating list of property values.
-@end defun
 @defun set-text-properties start end props &optional object
 This function completely replaces the text property list for the text
 between @var{start} and @var{end} in the string or buffer @var{object}.
@@ -3790,96 +3697,6 @@ using the specified or chosen coding system.  However, if
 coding instead.
 @end defun
-@node Atomic Changes
-@section Atomic Change Groups
-@cindex atomic changes
-  In data base terminology, an @dfn{atomic} change is an indivisible
-change---it can succeed entirely or it can fail entirely, but it
-cannot partly succeed.  A Lisp program can make a series of changes to
-one or several buffers as an @dfn{atomic change group}, meaning that
-either the entire series of changes will be installed in their buffers
-or, in case of an error, none of them will be.
-  To do this for one buffer, the one already current, simply write a
-call to @code{atomic-change-group} around the code that makes the
-changes, like this:
-@example
-(atomic-change-group
-  (insert foo)
-  (delete-region x y))
-@end example
-@noindent
-If an error (or other nonlocal exit) occurs inside the body of
-@code{atomic-change-group}, it unmakes all the changes in that buffer
-that were during the execution of the body.  This kind of change group
-has no effect on any other buffers--any such changes remain.
-  If you need something more sophisticated, such as to make changes in
-various buffers constitute one atomic group, you must directly call
-lower-level functions that @code{atomic-change-group} uses.
-@defun prepare-change-group &optional buffer
-This function sets up a change group for buffer @var{buffer}, which
-defaults to the current buffer.  It returns a ``handle'' that
-represents the change group.  You must use this handle to activate the
-change group and subsequently to finish it.
-@end defun
-  To use the change group, you must @dfn{activate} it.  You must do
-this before making any changes in the text of @var{buffer}.
-@defun activate-change-group handle
-This function activates the change group that @var{handle} designates.
-@end defun
-  After you activate the change group, any changes you make in that
-buffer become part of it.  Once you have made all the desired changes
-in the buffer, you must @dfn{finish} the change group.  There are two
-ways to do this: you can either accept (and finalize) all the changes,
-or cancel them all.
-@defun accept-change-group handle
-This function accepts all the changes in the change group specified by
-@var{handle}, making them final.
-@end defun
-@defun cancel-change-group handle
-This function cancels and undoes all the changes in the change group
-specified by @var{handle}.
-@end defun
-  Your code should use @code{unwind-protect} to make sure the group is
-always finished.  The call to @code{activate-change-group} should be
-inside the @code{unwind-protect}, in case the user types @kbd{C-g}
-just after it runs.  (This is one reason why
-@code{prepare-change-group} and @code{activate-change-group} are
-separate functions, because normally you would call
-@code{prepare-change-group} before the start of that
-@code{unwind-protect}.)  Once you finish the group, don't use the
-handle again---in particular, don't try to finish the same group
-twice.
-  To make a multibuffer change group, call @code{prepare-change-group}
-once for each buffer you want to cover, then use @code{nconc} to
-combine the returned values, like this:
-@example
-(nconc (prepare-change-group buffer-1)
-       (prepare-change-group buffer-2))
-@end example
-You can then activate the multibuffer change group with a single call
-to @code{activate-change-group}, and finish it with a single call to
-@code{accept-change-group} or @code{cancel-change-group}.
-  Nested use of several change groups for the same buffer works as you
-would expect.  Non-nested use of change groups for the same buffer
-will get Emacs confused, so don't let it happen; the first change
-group you start for any given buffer should be the last one finished.
 @node Change Hooks
 @section Change Hooks
 @cindex change hooks
@@ -3984,7 +3801,3 @@ properties (@pxref{Overlay Properties}).
 This variable is available starting in Emacs 21.
 @end defvar
-@ignore
-   arch-tag: 3721e738-a1cb-4085-bc1a-6cb8d8e1d32b
-@end ignore
diff --git a/lispref/tindex.pl b/lispref/tindex.pl
index 04eacb2e999..459a2b72e84 100755
--- a/lispref/tindex.pl
+++ b/lispref/tindex.pl
@@ -123,4 +123,3 @@ foreach $key (keys %removed) {
    print "  $key\n";
 }
-# arch-tag: f8460df6-6bef-4c98-8555-e2c63a88b0fa
diff --git a/lispref/tips.texi b/lispref/tips.texi
index d769fca581d..f10108d2d58 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -850,8 +850,7 @@ if we haven't installed it in Emacs yet!
 @end example
 @noindent
-The description should be complete in one line.  If the file
+The description should be complete in one line.
-needs a @samp{-*-} specification, put it after @var{description}.
  After the copyright notice come several @dfn{header comment} lines,
 each beginning with @samp{;; @var{header-name}:}.  Here is a table of
@@ -946,7 +945,3 @@ This is the @dfn{footer line}; it appears at the very end of the file.
 Its purpose is to enable people to detect truncated versions of the file
 from the lack of a footer line.
 @end table
-@ignore
-   arch-tag: 9ea911c2-6b1d-47dd-88b7-0a94e8b27c2e
-@end ignore
diff --git a/lispref/two.el b/lispref/two.el
index e8eb24a1d12..bad18d48485 100644
--- a/lispref/two.el
+++ b/lispref/two.el
@@ -57,5 +57,3 @@ This is for the *Elisp Ref Manual*"
 (defun volume-numbers-toc-markup-I () (volume-numbers-toc-markup "I"))
 (defun volume-numbers-toc-markup-II () (volume-numbers-toc-markup "II"))
-;;; arch-tag: 848955fe-e9cf-45e7-a2f1-570ef156d6a5
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 3848e465e41..bbed104a42b 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -198,18 +198,18 @@ is omitted, @code{nil} is used.
 All of the @var{value-form}s in @var{bindings} are evaluated in the
 order they appear and @emph{before} binding any of the symbols to them.
-Here is an example of this: @code{z} is bound to the old value of
+Here is an example of this: @code{Z} is bound to the old value of
-@code{y}, which is 2, not the new value of @code{y}, which is 1.
+@code{Y}, which is 2, not the new value of @code{Y}, which is 1.
 @example
 @group
-(setq y 2)
+(setq Y 2)
     @result{} 2
 @end group
 @group
-(let ((y 1)
+(let ((Y 1)
-      (z y))
+      (Z Y))
-  (list y z))
+  (list Y Z))
     @result{} (1 2)
 @end group
 @end example
@@ -225,13 +225,13 @@ form.  Compare the following example with the example above for
 @example
 @group
-(setq y 2)
+(setq Y 2)
     @result{} 2
 @end group
 @group
-(let* ((y 1)
+(let* ((Y 1)
-       (z y))    ; @r{Use the just-established value of @code{y}.}
+       (Z Y))    ; @r{Use the just-established value of @code{Y}.}
-  (list y z))
+  (list Y Z))
     @result{} (1 1)
 @end group
 @end example
@@ -1769,7 +1769,3 @@ lists in files being visited.  A value of @code{t} means process them
 unconditionally; @code{nil} means ignore them; anything else means ask
 the user what to do for each file.  The default value is @code{maybe}.
 @end defopt
-@ignore
-   arch-tag: 5ff62c44-2b51-47bb-99d4-fea5aeec5d3e
-@end ignore
diff --git a/lispref/vol1.texi b/lispref/vol1.texi
index cc771bf0359..9e60a75650f 100644
--- a/lispref/vol1.texi
+++ b/lispref/vol1.texi
@@ -1017,7 +1017,3 @@ Object Internals
 These words prevent "local variables" above from confusing Emacs.
-@ignore
-   arch-tag: 9594760d-8801-4d1b-aeb9-f3b3166b5be2
-@end ignore
diff --git a/lispref/vol2.texi b/lispref/vol2.texi
index f3cdb6db116..c15e1bc67b9 100644
--- a/lispref/vol2.texi
+++ b/lispref/vol2.texi
@@ -1017,7 +1017,3 @@ Object Internals
 These words prevent "local variables" above from confusing Emacs.
-@ignore
-   arch-tag: dfdbecf8-fec2-49c1-8427-3e8ac8b0b849
-@end ignore
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 8589f3cdbfa..36c9fb02a39 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -643,7 +643,7 @@ The functions described there are easier to use than these, but they
 employ heuristics in choosing or creating a window; use these functions
 when you need complete control.
-@defun set-window-buffer window buffer-or-name &optional keep-margins
+@defun set-window-buffer window buffer-or-name
 This function makes @var{window} display @var{buffer-or-name} as its
 contents.  It returns @code{nil}.  This is the fundamental primitive
 for changing which buffer is displayed in a window, and all ways
@@ -655,11 +655,6 @@ of doing that call this function.
     @result{} nil
 @end group
 @end example
-Normally, displaying @var{buffer} in @var{window} resets the window's
-fringe widths and position based on the local variables of @var{buffer}.
-However, if @var{keep-margins} is non-@code{nil}, the fringe widths and
-position of @var{window} remain unchanged.  @xref{Fringes}.
 @end defun
 @defun window-buffer &optional window
@@ -2207,7 +2202,3 @@ changing the sizes of windows, or displaying a different buffer in a
 window.  The frame whose window configuration has changed is the
 selected frame when this hook runs.
 @end defvar
-@ignore
-   arch-tag: 3f6c36e8-df49-4986-b757-417feed88be3
-@end ignore
author	Kenichi Handa	2003-09-08 11:56:09 +0000
committer	Kenichi Handa	2003-09-08 11:56:09 +0000
commit	463f5630a5e7cbe7f042bc1175d1fa1c4e98860f (patch)
tree	3287d0c628fea2249abf4635b3a4f45bedd6f8c4 /lispref
parent	4256310de631bd57c78b88b5131caa073315b3d7 (diff)
download	emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.tar.gz emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.zip