Merge from origin/emacs-26

675edec (origin/emacs-26) Fix some allout.el aliases
b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)...
2f5420c Doc fixes re obsolete items
9edf82a Replace an obsolete alias in tpu-mapper
a643792 Doc fixes re obsolete items
3060fb8 Minor changes in mule.texi
3e39897 Avoid assertion violation under visual-order-cursor-movement
e4b73ab Stop mentioning options.el in doc
05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last...
758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.
62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix.
761845c Fix last change in Xref documentation
5186675 More changes in the Emacs manual
b1aaa72 Improve documentation of Xref

Conflicts:
	lisp/w32-fns.el

26 files changed, 98 insertions, 94 deletions

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index b9e0ce44046..3fec5f44deb 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -728,7 +728,7 @@ direction.
 @findex digit-argument
 @findex negative-argument
   The easiest way to specify a numeric argument is to type a digit
-and/or a minus sign while holding down the @key{META} key.  For
+and/or a minus sign while holding down the @key{Meta} key.  For
 example,
 
 @example
@@ -742,7 +742,7 @@ well as @kbd{M--}, are bound to commands (@code{digit-argument} and
 command.  @kbd{M--} without digits normally means @minus{}1.
 
 If you enter more than one digit, you need not hold down the
-@key{META} key for the second and subsequent digits.  Thus, to move
+@key{Meta} key for the second and subsequent digits.  Thus, to move
 down fifty lines, type
 
 @example
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 8b8b0c7aad9..a992dedc929 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -44,25 +44,25 @@ are certain characters found on non-English keyboards
 @cindex M-
   Emacs also recognizes control characters that are entered using
 @dfn{modifier keys}.  Two commonly-used modifier keys are
-@key{Control} (usually labeled @key{Ctrl}), and @key{META} (usually
-labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{META} for
+@key{Control} (usually labeled @key{Ctrl}), and @key{Meta} (usually
+labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{Meta} for
 historical reasons.}.  For example, @kbd{Control-a} is entered by
 holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
-to this as @kbd{C-a} for short.  Similarly, @kbd{@key{META}-a}, or @kbd{M-a}
+to this as @kbd{C-a} for short.  Similarly, @kbd{@key{Meta}-a}, or @kbd{M-a}
 for short, is entered by holding down the @key{Alt} key and pressing
 @kbd{a}.  Modifier keys can also be applied to non-alphanumerical
 characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}.
 
-@cindex @key{ESC} replacing @key{META} key
+@cindex @key{ESC} replacing @key{Meta} key
   You can also type Meta characters using two-character sequences
 starting with @key{ESC}.  Thus, you can enter @kbd{M-a} by typing
 @kbd{@key{ESC} a}.  You can enter @kbd{C-M-a} (holding down both
 @key{Ctrl} and @key{Alt}, then pressing @kbd{a}) by typing
-@kbd{@key{ESC} C-a}.  Unlike @key{META}, @key{ESC} is entered as a
+@kbd{@key{ESC} C-a}.  Unlike @key{Meta}, @key{ESC} is entered as a
 separate character.  You don't hold down @key{ESC} while typing the
 next character; instead, press @key{ESC} and release it, then enter
 the next character.  This feature is useful on certain text terminals
-where the @key{META} key does not function reliably.
+where the @key{Meta} key does not function reliably.
 
 @cindex keys stolen by window manager
 @cindex window manager, keys stolen by
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 0905ae7bb12..be73d7a289a 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1745,10 +1745,11 @@ characters.  For example, here's how to bind @kbd{C-x M-l} to
 (global-set-key "\C-x\M-l" 'make-symbolic-link)
 @end example
 
-  To put @key{TAB}, @key{RET}, @key{ESC}, or @key{DEL} in the string,
-use the Emacs Lisp escape sequences @samp{\t}, @samp{\r}, @samp{\e},
-and @samp{\d} respectively.  Here is an example which binds @kbd{C-x
-@key{TAB}} to @code{indent-rigidly} (@pxref{Indentation}):
+  To bind a key sequence including @key{TAB}, @key{RET}, @key{ESC}, or
+@key{DEL}, the string should contain the Emacs Lisp escape sequence
+@samp{\t}, @samp{\r}, @samp{\e}, or @samp{\d} respectively.  Here is
+an example which binds @kbd{C-x @key{TAB}} to @code{indent-rigidly}
+(@pxref{Indentation}):
 
 @example
 (global-set-key "\C-x\t" 'indent-rigidly)
@@ -1822,11 +1823,11 @@ historical.
 characters case-sensitive when you customize Emacs.  For instance, you
 could make @kbd{M-a} and @kbd{M-A} run different commands.
 
-  Although only the @key{Control} and @key{META} modifier keys are
+  Although only the @key{Control} and @key{Meta} modifier keys are
 commonly used, Emacs supports three other modifier keys.  These are
 called @key{Super}, @key{Hyper}, and @key{Alt}.  Few terminals provide
 ways to use these modifiers; the key labeled @key{Alt} on most
-keyboards usually issues the @key{META} modifier, not @key{Alt}.  The
+keyboards usually issues the @key{Meta} modifier, not @key{Alt}.  The
 standard key bindings in Emacs do not include any characters with
 these modifiers.  However, you can customize Emacs to assign meanings
 to them.  The modifier bits are labeled as @samp{s-}, @samp{H-} and
@@ -1896,7 +1897,7 @@ the numeric keypad produces @code{kp-8}, which is translated to
 such as @kbd{8} or @key{UP}, it affects the equivalent keypad key too.
 However, if you rebind a @samp{kp-} key directly, that won't affect
 its non-keypad equivalent.  Note that the modified keys are not
-translated: for instance, if you hold down the @key{META} key while
+translated: for instance, if you hold down the @key{Meta} key while
 pressing the @samp{8} key on the numeric keypad, that generates
 @kbd{M-@key{kp-8}}.
 
@@ -2242,8 +2243,8 @@ sequences are mandatory.
 
 @samp{\C-} can be used as a prefix for a control character, as in
 @samp{\C-s} for @acronym{ASCII} control-S, and @samp{\M-} can be used as a prefix for
-a Meta character, as in @samp{\M-a} for @kbd{@key{META}-A} or
-@samp{\M-\C-a} for @kbd{@key{Ctrl}-@key{META}-A}.
+a Meta character, as in @samp{\M-a} for @kbd{@key{Meta}-A} or
+@samp{\M-\C-a} for @kbd{@key{Ctrl}-@key{Meta}-A}.
 
 @xref{Init Non-ASCII}, for information about including
 non-@acronym{ASCII} in your init file.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 01ae91002a3..cbf4194d397 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1240,7 +1240,7 @@ contents of the corresponding subdirectory.
   If you use @kbd{C-x d} or some other Dired command to visit a
 directory that is already being shown in a Dired buffer, Dired
 switches to that buffer but does not update it.  If the buffer is not
-up-to-date, Dired displays a warning telling you to type @key{g} to
+up-to-date, Dired displays a warning telling you to type @kbd{g} to
 update it.  You can also tell Emacs to revert each Dired buffer
 automatically when you revisit it, by setting the variable
 @code{dired-auto-revert-buffer} to a non-@code{nil} value.
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 6002e367cc9..02939679fef 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -29,7 +29,7 @@ Alt is the name of a modifier bit that a keyboard input character may
 have.  To make a character Alt, type it while holding down the @key{Alt}
 key.  Such characters are given names that start with @kbd{@key{Alt}-}
 (usually written @kbd{A-} for short).  (Note that many terminals have a
-key labeled @key{Alt} that is really a @key{META} key.)  @xref{User
+key labeled @key{Alt} that is really a @key{Meta} key.)  @xref{User
 Input, Alt}.
 
 @item Argument
@@ -174,7 +174,7 @@ misspelling.
 
 @item @kbd{C-M-}
 @kbd{C-M-} in the name of a character is an abbreviation for
-Control-Meta.  If your terminal lacks a real @key{META} key, you type
+Control-Meta.  If your terminal lacks a real @key{Meta} key, you type
 a Control-Meta character by typing @key{ESC} and then typing the
 corresponding Control character.  @xref{User Input,C-M-}.
 
@@ -507,7 +507,7 @@ Such messages appear in the echo area, accompanied by a beep.
 
 @item @key{ESC}
 @key{ESC} is a character used as a prefix for typing Meta characters on
-keyboards lacking a @key{META} key.  Unlike the @key{META} key (which,
+keyboards lacking a @key{Meta} key.  Unlike the @key{Meta} key (which,
 like the @key{SHIFT} key, is held down while another character is
 typed), you press the @key{ESC} key as you would press a letter key, and
 it applies to the next character you type.
@@ -881,7 +881,7 @@ A local value of a variable (q.v.@:) applies to only one buffer.
 @xref{Locals}.
 
 @item @kbd{M-}
-@kbd{M-} in the name of a character is an abbreviation for @key{META},
+@kbd{M-} in the name of a character is an abbreviation for @key{Meta},
 one of the modifier keys that can accompany any character.
 @xref{User Input,M-}.
 
@@ -939,15 +939,15 @@ a keyboard interface to navigate it.  @xref{Menu Bars}.
 
 @item Meta
 Meta is the name of a modifier bit which you can use in a command
-character.  To enter a meta character, you hold down the @key{META}
+character.  To enter a meta character, you hold down the @key{Meta}
 key while typing the character.  We refer to such characters with
 names that start with @kbd{Meta-} (usually written @kbd{M-} for
-short).  For example, @kbd{M-<} is typed by holding down @key{META}
+short).  For example, @kbd{M-<} is typed by holding down @key{Meta}
 and at the same time typing @kbd{<} (which itself is done, on most
 terminals, by holding down @key{SHIFT} and typing @kbd{,}).
 @xref{User Input,Meta}.
 
-On some terminals, the @key{META} key is actually labeled @key{Alt}
+On some terminals, the @key{Meta} key is actually labeled @key{Alt}
 or @key{Edit}.
 
 @item Meta Character
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index bf37d67b642..4982c78f2eb 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -35,7 +35,7 @@ Support}), but we hope to improve it in the future.
 @section Basic Emacs usage under macOS and GNUstep
 
   By default, the @key{Alt} and @key{Option} keys are the same as
-@key{META}.  The Mac @key{Cmd} key is the same as @key{Super}, and
+@key{Meta}.  The Mac @key{Cmd} key is the same as @key{Super}, and
 Emacs provides a set of key bindings using this modifier key that mimic
 other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}).  You
 can change these bindings in the usual way (@pxref{Key Bindings}).
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 8f71b12b81f..cda482877ae 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1078,7 +1078,7 @@ Revert the work file(s) in the current VC fileset to the last revision
 @findex vc-revert
 @vindex vc-revert-show-diff
   If you want to discard all the changes you have made to the current
-VC fileset, type @kbd{C-x v u} (@code{vc-revert-buffer}).  This shows
+VC fileset, type @kbd{C-x v u} (@code{vc-revert}).  This shows
 you a diff between the work file(s) and the revision from which you
 started editing, and asks for confirmation for discarding the changes.
 If you agree, the fileset is reverted.  If you don't want @kbd{C-x v
@@ -1812,6 +1812,8 @@ Find definition of identifier, and display it in a new frame
 @item M-,
 Go back to where you previously invoked @kbd{M-.} and friends
 (@code{xref-pop-marker-stack}).
+@item M-x xref-etags-mode
+Switch @code{xref} to use the @code{etags} backend.
 @end table
 
 @kindex M-.
@@ -1871,6 +1873,20 @@ where you were with @kbd{M-,}.  @kbd{M-,} allows you to retrace your
 steps to a depth determined by the variable
 @code{xref-marker-ring-length}, which defaults to 16.
 
+@findex xref-etags-mode
+  Some major modes install @code{xref} support facilities that might
+sometimes fail to find certain identifiers.  For example, in Emacs
+Lisp mode (@pxref{Lisp Eval}) @kbd{M-.} will by default find only
+functions and variables from Lisp packages which are loaded into the
+current Emacs session or are auto-loaded (@pxref{Autoload,,, elisp,
+The Emacs Lisp Reference Manual}).  If @kbd{M-.} fails to find some
+identifiers, you can try forcing @code{xref} to use the @code{etags}
+backend (@pxref{Xref}).  To this end, turn on the Xref Etags minor
+mode with @w{@kbd{M-x xref-etags-mode}}, then invoke @kbd{M-.} again.
+(For this to work, be sure to run @command{etags} to create the tags
+table in the directory tree of the source files, see @ref{Create Tags
+Table}.)
+
 @node Xref Commands
 @subsubsection Commands Available in the @file{*xref*} Buffer
 @cindex commands in @file{*xref*} buffers
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 9e650ba55f7..eb2eed0ffb9 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -344,12 +344,6 @@ window.  You can display the same list with @kbd{?}
 used with the completion list:
 
 @table @kbd
-@findex mouse-choose-completion
-@item mouse-1
-@itemx mouse-2
-Clicking mouse button 1 or 2 on a completion alternative chooses it
-(@code{mouse-choose-completion}).
-
 @findex switch-to-completions
 @item M-v
 @itemx @key{PageUp}
@@ -362,6 +356,8 @@ the same.  You can also select the window in other ways
 
 @findex choose-completion
 @item @key{RET}
+@itemx mouse-1
+@itemx mouse-2
 While in the completion list buffer, this chooses the completion at
 point (@code{choose-completion}).
 
diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 406ebd19051..64ce8414fc0 100644
--- a/doc/emacs/msdos-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -83,17 +83,17 @@ a running command and for emergency escape
 @cindex Super (under MS-DOS)
 @vindex dos-super-key
 @vindex dos-hyper-key
-  The PC keyboard maps use the left @key{Alt} key as the @key{META} key.
+  The PC keyboard maps use the left @key{Alt} key as the @key{Meta} key.
 You have two choices for emulating the @key{SUPER} and @key{Hyper} keys:
 choose either the right @key{Ctrl} key or the right @key{Alt} key by
 setting the variables @code{dos-hyper-key} and @code{dos-super-key} to 1
 or 2 respectively.  If neither @code{dos-super-key} nor
 @code{dos-hyper-key} is 1, then by default the right @key{Alt} key is
-also mapped to the @key{META} key.  However, if the MS-DOS international
+also mapped to the @key{Meta} key.  However, if the MS-DOS international
 keyboard support program @file{KEYB.COM} is installed, Emacs will
-@emph{not} map the right @key{Alt} to @key{META}, since it is used for
+@emph{not} map the right @key{Alt} to @key{Meta}, since it is used for
 accessing characters like @kbd{~} and @kbd{@@} on non-US keyboard
-layouts; in this case, you may only use the left @key{Alt} as @key{META}
+layouts; in this case, you may only use the left @key{Alt} as @key{Meta}
 key.
 
 @kindex C-j @r{(MS-DOS)}
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index b3b40d476e6..95969540f5b 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -547,7 +547,7 @@ Windows-specific variables in this category.
 @ifnottex
 @vindex w32-alt-is-meta
 @cindex @code{Alt} key (MS-Windows)
-  By default, the key labeled @key{Alt} is mapped as the @key{META}
+  By default, the key labeled @key{Alt} is mapped as the @key{Meta}
 key.  If you wish it to produce the @code{Alt} modifier instead, set
 the variable @code{w32-alt-is-meta} to a @code{nil} value.
 
@@ -605,8 +605,8 @@ Windows key and @key{R} opens the Windows @code{Run} dialog.
 
   The hotkey registrations always also include all the shift and
 control modifier combinations for the given hotkey; that is,
-registering @kbd{s-@key{a}} as a hotkey gives you @kbd{S-s-@key{a}},
-@kbd{C-s-@key{a}} and @kbd{C-S-s-@key{a}} as well.
+registering @kbd{s-a} as a hotkey gives you @kbd{S-s-a},
+@kbd{C-s-a} and @kbd{C-S-s-a} as well.
 
   On Windows 98 and ME, the hotkey registration is more restricted.
 The desired hotkey must always be fully specified, and
@@ -670,8 +670,8 @@ value other than the above modifier symbols.
 @cindex @code{Alt} key invokes menu (Windows)
   Emacs compiled as a native Windows application normally turns off
 the Windows feature that tapping the @key{Alt} key invokes the Windows
-menu.  The reason is that the @key{Alt} serves as @key{META} in Emacs.
-When using Emacs, users often press the @key{META} key temporarily and
+menu.  The reason is that the @key{Alt} serves as @key{Meta} in Emacs.
+When using Emacs, users often press the @key{Meta} key temporarily and
 then change their minds; if this has the effect of bringing up the
 Windows menu, it alters the meaning of subsequent commands.  Many
 users find this frustrating.
@@ -701,7 +701,7 @@ the combination of the right @key{Alt} and left @key{Ctrl} keys
 pressed together, is recognized as the @key{AltGr} key.  The default
 is @code{t}, which means these keys produce @code{AltGr}; setting it
 to @code{nil} causes @key{AltGr} or the equivalent key combination to
-be interpreted as the combination of @key{Ctrl} and @key{META}
+be interpreted as the combination of @key{Ctrl} and @key{Meta}
 modifiers.
 @end ifnottex
 
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index dc80bc92172..5ddfb7defd2 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -51,7 +51,7 @@ others.
 @item
 You can insert non-@acronym{ASCII} characters or search for them.  To do that,
 you can specify an input method (@pxref{Select Input Method}) suitable
-for your language, or use the default input method set up when you chose
+for your language, or use the default input method set up when you choose
 your language environment.  If
 your keyboard can produce non-@acronym{ASCII} characters, you can select an
 appropriate keyboard coding system (@pxref{Terminal Coding}), and Emacs
@@ -698,7 +698,7 @@ carriage-return (Mac).
 Describe coding system @var{coding} (@code{describe-coding-system}).
 
 @item C-h C @key{RET}
-Describe the coding systems currently in use.
+Describe the coding systems currently in use (@code{describe-coding-system}).
 
 @item M-x list-coding-systems
 Display a list of all the supported coding systems.
@@ -936,7 +936,7 @@ or a local variables list at the end (@pxref{File Variables}).  You do
 this by defining a value for the ``variable'' named @code{coding}.
 Emacs does not really have a variable @code{coding}; instead of
 setting a variable, this uses the specified coding system for the
-file.  For example, @samp{-*-mode: C; coding: latin-1;-*-} specifies
+file.  For example, @w{@samp{-*-mode: C; coding: latin-1; -*-}} specifies
 use of the Latin-1 coding system, as well as C mode.  When you specify
 the coding explicitly in the file, that overrides
 @code{file-coding-system-alist}.
@@ -1207,13 +1207,13 @@ using the internal Emacs representation.
 @cindex file-name encoding, MS-Windows
 @vindex w32-unicode-filenames
   When Emacs runs on MS-Windows versions that are descendants of the
-NT family (Windows 2000, XP, Vista, Windows 7, and all the later
-versions), the value of @code{file-name-coding-system} is largely
-ignored, as Emacs by default uses APIs that allow passing Unicode file
-names directly.  By contrast, on Windows 9X, file names are encoded
-using @code{file-name-coding-system}, which should be set to the
-codepage (@pxref{Coding Systems, codepage}) pertinent for the current
-system locale.  The value of the variable @code{w32-unicode-filenames}
+NT family (Windows 2000, XP, and all the later versions), the value of
+@code{file-name-coding-system} is largely ignored, as Emacs by default
+uses APIs that allow passing Unicode file names directly.  By
+contrast, on Windows 9X, file names are encoded using
+@code{file-name-coding-system}, which should be set to the codepage
+(@pxref{Coding Systems, codepage}) pertinent for the current system
+locale.  The value of the variable @code{w32-unicode-filenames}
 controls whether Emacs uses the Unicode APIs when it calls OS
 functions that accept file names.  This variable is set by the startup
 code to @code{nil} on Windows 9X, and to @code{t} on newer versions of
@@ -1779,8 +1779,9 @@ of the first character you read precedes that of the next character.
 Reordering of bidirectional text into the @dfn{visual} order happens
 at display time.  As a result, character positions no longer increase
 monotonically with their positions on display.  Emacs implements the
-Unicode Bidirectional Algorithm (UBA) described in the Unicode
-Standard Annex #9, for reordering of bidirectional text for display.
+Unicode Bidirectional Algorithm (UBA) described in the
+@uref{http://unicode.org/reports/tr9/, Unicode Standard Annex #9}, for
+reordering of bidirectional text for display.
 It deviates from the UBA only in how continuation lines are displayed
 when text direction is opposite to the base paragraph direction,
 e.g., when a long line of English text appears in a right-to-left
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 012c73d8dbd..6a5fc7c6f63 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -117,7 +117,7 @@ cognate to @kbd{C-@@}, which is an alias for @kbd{C-@key{SPC}}.
 @findex backward-word
   The commands @kbd{M-f} (@code{forward-word}) and @kbd{M-b}
 (@code{backward-word}) move forward and backward over words.  These
-@key{META}-based key sequences are analogous to the key sequences
+@key{Meta}-based key sequences are analogous to the key sequences
 @kbd{C-f} and @kbd{C-b}, which move over single characters.  The
 analogy extends to numeric arguments, which serve as repeat counts.
 @kbd{M-f} with a negative argument moves backward, and @kbd{M-b} with
@@ -1331,7 +1331,7 @@ quad click: exit all folds and hide text.
 @c FIXME not marked as a user variable
 @vindex foldout-mouse-modifiers
   You can specify different modifier keys (instead of
-@kbd{@key{Ctrl}-@key{META}-}) by setting @code{foldout-mouse-modifiers}; but if
+@kbd{@key{Ctrl}-@key{Meta}-}) by setting @code{foldout-mouse-modifiers}; but if
 you have already loaded the @file{foldout.el} library, you must reload
 it in order for this to take effect.
 
@@ -2765,8 +2765,7 @@ Invoking @kbd{M-x table-capture} on that text produces this table:
 to plain text, removing its cell borders.
 
   One application of this pair of commands is to edit a text in
-layout.  Look at the following three paragraphs (the latter two are
-indented with header lines):
+layout.  Look at the following three paragraphs:
 
 @example
 table-capture is a powerful command.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 1fe7948ab81..be78a53ed66 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -31292,7 +31292,7 @@ for @code{Save} have no effect.
 You can modify Embedded mode's behavior by setting various Lisp
 variables described here.  These variables are customizable
 (@pxref{Customizing Calc}), or you can use @kbd{M-x set-variable}
-or @kbd{M-x edit-options} to adjust a variable on the fly.
+to adjust a variable on the fly.
 (Another possibility would be to use a file-local variable annotation at
 the end of the file;
 @pxref{File Variables, , Local Variables in Files, emacs, the Emacs manual}.)
@@ -31311,9 +31311,8 @@ regular expression is not completely plain, let's go through it
 in detail.
 
 The surrounding @samp{" "} marks quote the text between them as a
-Lisp string.  If you left them off, @code{set-variable} or
-@code{edit-options} would try to read the regular expression as a
-Lisp program.
+Lisp string.  If you left them off, @code{set-variable} (for example)
+would try to read the regular expression as a Lisp program.
 
 The most obvious property of this regular expression is that it
 contains indecently many backslashes.  There are actually two levels
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 8cdf870ad64..a4e82e2d923 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -906,7 +906,7 @@ The doc string contains a list of the system sounds you can use.
 @cindex font XLFD name format
 @cindex fontconfig font names in Emacs 23
 @cindex font dialog, using to find font names
-@findex w32-select-font
+@findex x-select-font
 @findex x-list-fonts
 
 Fonts in Emacs 22 and earlier are named using the X Logical Font
@@ -937,7 +937,7 @@ Fontconfig: Courier New-13
 To find the XFLD name for a font, you can execute the following in the
 @file{*scratch*} buffer by pressing C-j at the end of the line:
 @example
-(w32-select-font nil t)
+(x-select-font nil t)
 @end example
 
 To see a complete list of fonts, execute the following in the
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index 6bc57daf627..c4cf7dac0a6 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -1379,9 +1379,9 @@ For example, I customize this to:
 ((t :background "black" :foreground "white" :family "misc-fixed"))
 @end lisp
 
-@item hfy-init-kludge-hooks
-@vindex hfy-init-kludge-hooks
-@anchor{hfy-init-kludge-hooks}
+@item hfy-init-kludge-hook
+@vindex hfy-init-kludge-hook
+@anchor{hfy-init-kludge-hook}
 
 List of functions to call when starting htmlfontify-buffer to do any
 kludging necessary to get highlighting modes to behave as you want, even
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index ed39aab2a37..1acf5f2319e 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1263,19 +1263,6 @@ You can use this function to do completion of URLs from the history.
 @node Customization
 @chapter Customization
 
-@cindex environment variables
-  The following environment variables affect the @code{url} library's
-operation at startup.
-
-@table @code
-@item TMPDIR
-@vindex TMPDIR
-@vindex url-temporary-directory
-If this is defined, @code{url-temporary-directory} is initialized from
-it.  This variable was obsoleted in 23.1, please use
-@code{temporary-file-directory} instead.
-@end table
-
   The following user options affect the general operation of
 @code{url} library.
 
diff --git a/etc/TODO b/etc/TODO
index a6ab8787f73..de579746ac7 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -216,7 +216,6 @@ Change them to use report-emacs-bug.
 **** lm-report-bug
 **** tramp-bug
 **** c-submit-bug-report
-**** ffap-bug and ffap-submit-bug (obsoleted)
 [Do all of them need changing?]
 
 ** Allow fringe indicators to display a tooltip (provide a help-echo property?)
diff --git a/lisp/allout.el b/lisp/allout.el
index a0456d5bd26..af71ea75ce0 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1522,7 +1522,7 @@ the Emacs buffer state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-verifier-string)
 (make-obsolete-variable 'allout-passphrase-verifier-string
-			'allout-passphrase-verifier-string "23.3")
+			"it is no longer used." "23.3")
 ;;;###autoload
 (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp)
 ;;;_   = allout-passphrase-hint-string
@@ -1538,7 +1538,7 @@ state, if file variable adjustments are enabled.  See
 (make-variable-buffer-local 'allout-passphrase-hint-string)
 (setq-default allout-passphrase-hint-string "")
 (make-obsolete-variable 'allout-passphrase-hint-string
-			'allout-passphrase-hint-string "23.3")
+			"it is no longer used." "23.3")
 ;;;###autoload
 (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp)
 ;;;_   = allout-after-save-decrypt
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 7c5294fa17e..9d4d2d8b383 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -297,9 +297,9 @@ modes only."
 
 (defcustom highlight-changes-global-changes-existing-buffers nil
   "If non-nil, toggling global Highlight Changes mode affects existing buffers.
-Normally, `global-highlight-changes' affects only new buffers (to be
+Normally, `global-highlight-changes-mode' affects only new buffers (to be
 created).  However, if `highlight-changes-global-changes-existing-buffers'
-is non-nil, then turning on `global-highlight-changes' will turn on
+is non-nil, then turning on `global-highlight-changes-mode' will turn on
 Highlight Changes mode in suitable buffers, and turning the mode off will
 remove it from existing buffers."
   :type 'boolean
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 9b6f043b576..3227917494e 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -987,7 +987,8 @@ Moves point to the end of the new text."
 (defcustom completion-cycle-threshold nil
   "Number of completion candidates below which cycling is used.
 Depending on this setting `completion-in-region' may use cycling,
-like `minibuffer-force-complete'.
+whereby invoking a completion command several times in a row
+completes to each of the candidates in turn, in a cyclic manner.
 If nil, cycling is never used.
 If t, cycling is always used.
 If an integer, cycling is used so long as there are not more
diff --git a/lisp/obsolete/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el
index 6a5a83c888b..4cc2404e4e7 100644
--- a/lisp/obsolete/tpu-mapper.el
+++ b/lisp/obsolete/tpu-mapper.el
@@ -56,7 +56,7 @@
           (set-buffer "Keys")
           (insert (format"(global-set-key %s %s)\n" tpu-key func))
           (set-buffer "Gold-Keys")
-          (insert (format "(define-key GOLD-map %s %s)\n" tpu-key gold-func))))
+          (insert (format "(define-key tpu-gold-map %s %s)\n" tpu-key gold-func))))
     (message "Press %s%s: " ident descrip)
     (setq tpu-key-seq (read-event)
           tpu-key (format "[%s]" tpu-key-seq))
@@ -203,7 +203,7 @@ your local X guru can try to figure out why the key is being ignored."
 ")
   (set-buffer "Directions")
 
-  (tpu-map-key "PF1"  " - The GOLD key"               "GOLD-map"                 "'keyboard-quit")
+  (tpu-map-key "PF1"  " - The GOLD key"               "tpu-gold-map"              "'keyboard-quit")
   (tpu-map-key "PF2"  " - The Keypad Help key"        "'tpu-help"                 "'help-for-help")
   (tpu-map-key "PF3"  " - The Find/Find-Next key"     "'tpu-search-again"         "'tpu-search")
   (tpu-map-key "PF4"  " - The Del/Undelete Line key"  "'tpu-delete-current-line"  "'tpu-undelete-lines")
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 2d3f6e22a6c..76c9be93d03 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -231,7 +231,7 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
   "Non-nil means remove trailing spaces and untabify the buffer before saving."
   :type 'boolean :group 'ada)
 (make-obsolete-variable 'ada-clean-buffer-before-saving
-			"use the `write-file-functions' hook."
+			"it has no effect - use `write-file-functions' hook."
 			"23.2")
 
 
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index 7d20e02d80d..e207d22ff4a 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -47,8 +47,8 @@
 ;; `metafont-mode-hook' and `metapost-mode-hook' which apply to the
 ;; individual modes.  In addition, there are several variables and
 ;; regexps controlling e.g. the behavior of the indentation function,
-;; which may be customized via `edit-options'.  Please refer to the
-;; docstrings in the code below for details.
+;; which may be customized.  Please refer to the docstrings in the code
+;; below for details.
 
 ;; Availability:
 ;;
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index db595331bbd..18da6e33578 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -697,7 +697,7 @@ share the same state."
 (defun vc-dir-unmark ()
   "Unmark the current file or all files in the region.
 If the region is active, unmark all the files in the region.
-Otherwise mark the file on the current line and move to the next
+Otherwise unmark the file on the current line and move to the next
 line."
   (interactive)
   (vc-dir-mark-unmark 'vc-dir-unmark-file))
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index b400c8d4a6f..825420c4261 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -256,7 +256,7 @@ bit output with no translation."
 
 (when (boundp 'w32-charset-info-alist)
   ;; The last charset we add becomes the "preferred" charset for the return
-  ;; value from w32-select-font etc, so list the most important charsets last.
+  ;; value from x-select-font etc, so list the most important charsets last.
   (w32-add-charset-info "iso8859-14" 'w32-charset-ansi  28604)
   (w32-add-charset-info "iso8859-15" 'w32-charset-ansi  28605)
   ;; The following two are included for pattern matching.
diff --git a/src/xdisp.c b/src/xdisp.c
index 693e273eb07..c0fdeca4847 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22488,6 +22488,11 @@ Value is the new character position of point.  */)
 		    new_pos += (row->reversed_p ? -dir : dir);
 		  else
 		    new_pos -= (row->reversed_p ? -dir : dir);
+		  new_pos = clip_to_bounds (BEGV, new_pos, ZV);
+		  /* If we didn't move, we've hit BEGV or ZV, so we
+		     need to signal a suitable error.  */
+		  if (new_pos == PT)
+		    break;
 		}
 	      else if (BUFFERP (g->object))
 		new_pos = g->charpos;