Merge from origin/emacs-26

cb0d40e (origin/emacs-26) Minor change in the manual
7e26d83 More minor changes in the manual
6851754 Replace some obsolete aliases in code
6bcb48c Replace some obsolete aliases in documentation
317da2a Minor improvements in manuals
61c1f80 Minor copyedits in display.texi
d523e4a Remove some unused spam.el variables
501808c Replace some obsolete aliases in code
19afff3 Replace some obsolete aliases in documentation
c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
0efe0bd Obsolete eshell-cmpl-suffix-list
add48d2 More minor changes in the Glossary of the Emacs manual
f6bd7e0 Revert last commit
af4697f Define if-let* and derivatives as aliases for if-let etc
ec79bdc Minor fix in Emacs manual's Glossary

24 files changed, 84 insertions, 71 deletions

diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index f8c1856058a..dd7a653186c 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -32,6 +32,13 @@ buffer.  When there is only one Emacs window, the buffer displayed in
 that window is current.  When there are multiple windows, the buffer
 displayed in the @dfn{selected window} is current.  @xref{Windows}.
 
+@cindex buffer contents
+@cindex contents of a buffer
+  A buffer's @dfn{contents} consist of a series of characters, each of
+which optionally carries a set of text properties
+(@pxref{International Chars, Text properties}) that can specify more
+information about that character.
+
   Aside from its textual contents, each buffer records several pieces
 of information, such as what file it is visiting (if any), whether it
 is modified, and what major mode and minor modes are in effect
@@ -231,13 +238,14 @@ Scroll through buffer @var{buffer}.  @xref{View Mode}.
 @kindex C-x C-q
 @vindex buffer-read-only
 @cindex read-only buffer
-  A buffer can be @dfn{read-only}, which means that commands to change
-its contents are not allowed.  The mode line indicates read-only
-buffers with @samp{%%} or @samp{%*} near the left margin.  @xref{Mode
-Line}.  Read-only buffers are usually made by subsystems such as Dired
-and Rmail that have special commands to operate on the text.  Visiting
-a file whose access control says you cannot write it also makes the
-buffer read-only.
+  A buffer can be @dfn{read-only}, which means that commands to insert
+or delete its text are not allowed.  (However, other commands, like
+@kbd{C-x @key{RET} f}, can still mark it as modified, @pxref{Text
+Coding}).  The mode line indicates read-only buffers with @samp{%%} or
+@samp{%*} near the left margin.  @xref{Mode Line}.  Read-only buffers
+are usually made by subsystems such as Dired and Rmail that have
+special commands to operate on the text.  Visiting a file whose access
+control says you cannot write it also makes the buffer read-only.
 
 @findex read-only-mode
 @vindex view-read-only
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 312f70e13ba..499be26004d 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -971,7 +971,7 @@ version.)
 Highlight text that matches @var{regexp} using face @var{face}
 (@code{highlight-regexp}).  The highlighting will remain as long as
 the buffer is loaded.  For example, to highlight all occurrences of
-the word ``whim'' using the default face (a yellow background)
+the word ``whim'' using the default face (a yellow background), type
 @kbd{M-s h r whim @key{RET} @key{RET}}.  Any face can be used for
 highlighting, Hi Lock provides several of its own and these are
 pre-loaded into a list of default values.  While being prompted
@@ -1258,7 +1258,7 @@ Highlight empty lines.
 @item big-indent
 @vindex whitespace-big-indent-regexp
 Highlight too-deep indentation.  By default any sequence of at least 4
-consecutive TAB characters or 32 consecutive SPC characters is
+consecutive tab characters or 32 consecutive space characters is
 highlighted.  To change that, customize the regular expression
 @code{whitespace-big-indent-regexp}.
 
@@ -1649,8 +1649,8 @@ Emacs can display long lines by @dfn{truncation}.  This means that all
 the characters that do not fit in the width of the screen or window do
 not appear at all.  On graphical displays, a small straight arrow in
 the fringe indicates truncation at either end of the line.  On text
-terminals, this is indicated with @samp{$} signs in the leftmost
-and/or rightmost columns.
+terminals, this is indicated with @samp{$} signs in the rightmost
+and/or leftmost columns.
 
 @vindex truncate-lines
 @findex toggle-truncate-lines
@@ -1676,8 +1676,9 @@ line truncation.  @xref{Split Window}, for the variable
 @dfn{word wrap}.  Here, each long logical line is divided into two or
 more screen lines, like in ordinary line continuation.  However, Emacs
 attempts to wrap the line at word boundaries near the right window
-edge.  This makes the text easier to read, as wrapping does not occur
-in the middle of words.
+edge.  (If line's direction is right-to-left, it is wrapped at the
+left window edge instead.)  This makes the text easier to read, as
+wrapping does not occur in the middle of words.
 
 @cindex mode, Visual Line
 @cindex Visual Line mode
@@ -1688,8 +1689,8 @@ To turn on Visual Line mode in the current buffer, type @kbd{M-x
 visual-line-mode}; repeating this command turns it off.  You can also
 turn on Visual Line mode using the menu bar: in the Options menu,
 select the @samp{Line Wrapping in this Buffer} submenu, followed by
-the @samp{Word Wrap (Visual Line Mode)} menu item.  While Visual Line
-mode is enabled, the mode-line shows the string @samp{wrap} in the
+the @samp{Word Wrap (Visual Line mode)} menu item.  While Visual Line
+mode is enabled, the mode line shows the string @samp{wrap} in the
 mode display.  The command @kbd{M-x global-visual-line-mode} toggles
 Visual Line mode in all buffers.
 
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index fd9e97f2d5f..6002e367cc9 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -720,10 +720,11 @@ customizing the various hooks, you can modify Emacs's behavior without
 changing any of its code.  @xref{Hooks}.
 
 @item Hyper
-Hyper is the name of a modifier bit that a keyboard input character may
-have.  To make a character Hyper, type it while holding down the
+Hyper is the name of a modifier bit that a keyboard input character
+may have.  To make a character Hyper, type it while holding down the
 @key{Hyper} key.  Such characters are given names that start with
-@kbd{Hyper-} (usually written @kbd{H-} for short).  @xref{User Input}.
+@kbd{Hyper-} (usually written @kbd{H-} for short).  @xref{Modifier
+Keys}.
 
 @item i.e.
 Short for ``id est'' in Latin, which means ``that is''.
@@ -1090,8 +1091,9 @@ The primary selection is one particular X selection (q.v.); it is the
 selection that most X applications use for transferring text to and from
 other applications.
 
-The Emacs kill commands set the primary selection and the yank command
-uses the primary selection when appropriate.  @xref{Killing}.
+The Emacs commands that mark or select text set the primary selection,
+and clicking the mouse inserts text from the primary selection when
+appropriate.  @xref{Shift Selection}.
 
 @item Prompt
 A prompt is text used to ask you for input.  Displaying a prompt
@@ -1342,10 +1344,11 @@ which characters balance each other like parentheses, etc.
 Manual}.
 
 @item Super
-Super is the name of a modifier bit that a keyboard input character may
-have.  To make a character Super, type it while holding down the
+Super is the name of a modifier bit that a keyboard input character
+may have.  To make a character Super, type it while holding down the
 @key{SUPER} key.  Such characters are given names that start with
-@kbd{Super-} (usually written @kbd{s-} for short).  @xref{User Input}.
+@kbd{Super-} (usually written @kbd{s-} for short).  @xref{Modifier
+Keys}.
 
 @item Suspending
 Suspending Emacs means stopping it temporarily and returning control
@@ -1492,13 +1495,13 @@ Emacs divides a frame (q.v.@:) into one or more windows, each of which
 can display the contents of one buffer (q.v.@:) at any time.
 @xref{Screen}, for basic information on how Emacs uses the screen.
 @xref{Windows}, for commands to control the use of windows.  Some
-other editors use the term ``window'' for what we call a ``frame''
-(q.v.@:) in Emacs.
+other editors use the term ``window'' for what we call a ``frame'' in
+Emacs.
 
 @item Window System
 A window system is software that operates on a graphical display
-(q.v.), to subdivide the screen so that multiple applications can
-have their] own windows at the same time.  All modern operating systems
+(q.v.), to subdivide the screen so that multiple applications can have
+their own windows at the same time.  All modern operating systems
 include a window system.
 
 @item Word Abbrev
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index be471099a57..49d1b9d2b11 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -815,11 +815,13 @@ options which control the operation of this mode include:
 
 @itemize @bullet
 @item
-@code{show-paren-highlight-open-paren} controls whether to highlight
+@vindex show-paren-highlight-openparen
+@code{show-paren-highlight-openparen} controls whether to highlight
 an open paren when point stands just before it, and hence its position
 is marked by the cursor anyway.  The default is non-@code{nil} (yes).
 
 @item
+@vindex show-paren-style
 @code{show-paren-style} controls whether just the two parens, or also
 the space between them get highlighted.  The valid options here are
 @code{parenthesis} (show the matching paren), @code{expression}
@@ -828,10 +830,12 @@ the space between them get highlighted.  The valid options here are
 expression otherwise).
 
 @item
+@vindex show-paren-when-point-inside-paren
 @code{show-paren-when-point-inside-paren}, when non-@code{nil}, causes
 highlighting also when point is on the inside of a parenthesis.
 
 @item
+@vindex show-paren-when-point-in-periphery
 @code{show-paren-when-point-in-periphery}, when non-@code{nil}, causes
 highlighting also when point is in whitespace at the beginning or end
 of a line, and there is a paren at, respectively, the first or last,
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 8137945601b..012c73d8dbd 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2067,27 +2067,27 @@ hook @code{text-mode-hook}, then @code{nroff-mode-hook}
 separators, pages are separated by @samp{.bp} commands, and comments
 start with backslash-doublequote.  It also defines these commands:
 
-@findex forward-text-line
-@findex backward-text-line
-@findex count-text-lines
+@findex nroff-forward-text-line
+@findex nroff-backward-text-line
+@findex nroff-count-text-lines
 @kindex M-n @r{(Nroff mode)}
 @kindex M-p @r{(Nroff mode)}
 @kindex M-? @r{(Nroff mode)}
 @table @kbd
 @item M-n
 Move to the beginning of the next line that isn't an nroff command
-(@code{forward-text-line}).  An argument is a repeat count.
+(@code{nroff-forward-text-line}).  An argument is a repeat count.
 @item M-p
-Like @kbd{M-n} but move up (@code{backward-text-line}).
+Like @kbd{M-n} but move up (@code{nroff-backward-text-line}).
 @item M-?
 Displays in the echo area the number of text lines (lines that are not
-nroff commands) in the region (@code{count-text-lines}).
+nroff commands) in the region (@code{nroff-count-text-lines}).
 @end table
 
-@findex electric-nroff-mode
+@findex nroff-electric-mode
   Electric Nroff mode is a buffer-local minor mode that can be used
 with Nroff mode.  To toggle this minor mode, type @kbd{M-x
-electric-nroff-mode} (@pxref{Minor Modes}).  When the mode is on, each
+nroff-electric-mode} (@pxref{Minor Modes}).  When the mode is on, each
 time you type @key{RET} to end a line containing an nroff command that
 opens a kind of grouping, the nroff command to close that grouping is
 automatically inserted on the following line.
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index e025d3fd10b..aecee6f3056 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -165,7 +165,7 @@ receive local values, which are the actual arguments supplied to the
 function call; these local bindings take effect within the body of the
 function.  To take another example, the @code{let} special form
 explicitly establishes local bindings for specific variables, which
-take effect within the body of the @code{let} form.
+take effect only within the body of the @code{let} form.
 
   We also speak of the @dfn{global binding}, which is where
 (conceptually) the global value is kept.
@@ -204,7 +204,8 @@ bindings:
 This special form sets up local bindings for a certain set of
 variables, as specified by @var{bindings}, and then evaluates all of
 the @var{forms} in textual order.  Its return value is the value of
-the last form in @var{forms}.
+the last form in @var{forms}.  The local bindings set up by @code{let}
+will be in effect only within the body of @var{forms}.
 
 Each of the @var{bindings} is either @w{(i) a} symbol, in which case
 that symbol is locally bound to @code{nil}; or @w{(ii) a} list of the
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index af002d7a28f..8cdf870ad64 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -1595,7 +1595,7 @@ non-@code{nil}, you should set it to @code{nil}:
 @cindex movemail, using pop3
 @cindex MAILHOST
 @vindex rmail-primary-inbox-list
-@vindex rmail-pop-password-required
+@vindex rmail-remote-password-required
 
 For incoming mail using the Rmail package and a POP3 server, you will
 need the following configuration:
@@ -1603,7 +1603,7 @@ need the following configuration:
 @example
 (setenv "MAILHOST" "@var{domain.name.of.your.pop3.server}")
 (setq rmail-primary-inbox-list '("po:@var{your logon id}"))
-(setq rmail-pop-password-required t)
+(setq rmail-remote-password-required t)
 @end example
 
 @node Incoming mail with Gnus
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index e1575f592bf..d657ba64c40 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -4340,7 +4340,7 @@ fontset, or you can select it by setting the default font in your
 @file{~/.emacs}:
 
 @lisp
-  (set-default-font "fontset-bdf")
+  (set-frame-font "fontset-bdf")
 @end lisp
 
 
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 1c1b014f54e..d67c4e61456 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -979,8 +979,8 @@ With a numeric argument (@kbd{C-u}), flush cached data before expanding.
 Contract the item under the cursor.
 @end table
 
-@cindex @code{speedbar-line-path}
-These function require that function @code{speedbar-line-path} be
+@cindex @code{speedbar-line-directory}
+These functions require that the function @code{speedbar-line-directory} be
 correctly overloaded to work.
 
 Next, register your extension like this;
@@ -1013,14 +1013,14 @@ like this:
 (speedbar-add-mode-functions-list
  '("MYEXTENSION"
    (speedbar-item-info . MyExtension-speedbar-item-info)
-   (speedbar-line-path . MyExtension-speedbar-line-path)))
+   (speedbar-line-directory . MyExtension-speedbar-line-directory)))
 @end example
 
 The first element in the list is the name of you extension.  The second
 is an alist of functions to overload.  The function to overload is
 first, followed by what you want called instead.
 
-For @code{speedbar-line-path} your function should take an optional DEPTH
+For @code{speedbar-line-directory} your function should take an optional DEPTH
 parameter.  This is the starting depth for heavily indented lines.  If
 it is not provided, you can derive it like this:
 
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 53586c54180..7858041440d 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -386,7 +386,7 @@ Matches the visited file name against the elements of `auto-insert-alist'."
 	      (not (eq this-command 'auto-insert))
 	      (set-buffer-modified-p (eq auto-insert t)))))
   ;; Return nil so that it could be used in
-  ;; `find-file-not-found-hooks', though that's probably inadvisable.
+  ;; `find-file-not-found-functions', though that's probably inadvisable.
   nil)
 
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 13a88ad11fa..c8eca30e88b 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -902,7 +902,7 @@ Two differences:
   (viper-setup-ESC-to-escape t)
 
   (add-hook 'change-major-mode-hook #'viper-major-mode-change-sentinel)
-  (add-hook 'find-file-hooks #'set-viper-state-in-major-mode)
+  (add-hook 'find-file-hook #'set-viper-state-in-major-mode)
 
   ;; keep this because many modes we don't know about use this hook
   (defvar text-mode-hook)
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index d99a3ef51a9..135c956c3f4 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -95,7 +95,7 @@ the mode if ARG is omitted or nil."
   :initialize 'custom-initialize-delay
   (setq file-name-handler-alist
 	(delq epa-file-handler file-name-handler-alist))
-  (remove-hook 'find-file-hooks 'epa-file-find-file-hook)
+  (remove-hook 'find-file-hook 'epa-file-find-file-hook)
   (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry
 			      auto-mode-alist))
   (when auto-encryption-mode
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index fe34d9546a6..a9b29aef4c0 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -167,6 +167,9 @@ to writing a completion function."
   (eshell-cmpl--custom-variable-docstring 'pcomplete-suffix-list)
   :type (get 'pcomplete-suffix-list 'custom-type)
   :group 'pcomplete)
+;; Only labelled obsolete in 26.1, but all it does it set
+;; pcomplete-suffix-list, which is itself obsolete since 24.1.
+(make-obsolete-variable 'eshell-cmpl-suffix-list nil "24.1")
 
 (defcustom eshell-cmpl-recexact nil
   (eshell-cmpl--custom-variable-docstring 'pcomplete-recexact)
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 4e479d1b82b..22be2f85369 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -248,7 +248,7 @@ it passes it on to `dired'."
 
 (defcustom ffap-newfile-prompt nil
   ;; Suggestion from RHOGEE, 11 Jul 1994.  Disabled, I think this is
-  ;; better handled by `find-file-not-found-hooks'.
+  ;; better handled by `find-file-not-found-functions'.
   "Whether `find-file-at-point' prompts about a nonexistent file."
   :type 'boolean
   :group 'ffap)
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 14bd14924ff..77afb09a2a8 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -945,7 +945,7 @@ first.  Otherwise, find the newest one, though it may take a time."
   "Like `insert-file-contents', q.v., but only reads in the file.
 A buffer may be modified in several ways after reading into the buffer due
 to advanced Emacs features, such as file-name-handlers, format decoding,
-find-file-hooks, etc.
+find-file-hook, etc.
   This function ensures that none of these modifications will take place."
   (let ((coding-system-for-read nnheader-file-coding-system))
     (mm-insert-file-contents filename visit beg end replace)))
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index de8aa77efc9..71a69cb5f01 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -408,16 +408,12 @@ Only meaningful if you enable `spam-use-regex-body'."
   "Spam ifile configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program
-                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-ifile-program (executable-find "ifile")
   "Name of the ifile program."
   :type '(choice (file :tag "Location of ifile")
                  (const :tag "ifile is not installed"))
   :group 'spam-ifile)
 
-(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database
-                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-ifile-database nil
   "File name of the ifile database."
   :type '(choice (file :tag "Location of the ifile database")
@@ -447,8 +443,6 @@ your main source of newsgroup names."
   "Spam bogofilter configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program
-                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-bogofilter-program (executable-find "bogofilter")
   "Name of the Bogofilter program."
   :type '(choice (file :tag "Location of bogofilter")
@@ -499,8 +493,6 @@ When nil, use the default location."
   "Spam bsfilter configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-bsfilter-path 'spam-bsfilter-program
-                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-bsfilter-program (executable-find "bsfilter")
   "Name of the Bsfilter program."
   :type '(choice (file :tag "Location of bsfilter")
@@ -565,8 +557,6 @@ When nil, use the default spamoracle database."
   "Spam SpamAssassin configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-spamassassin-path
-  'spam-spamassassin-program "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-assassin-program (executable-find "spamassassin")
   "Name of the spamassassin program.
 Hint: set this to \"spamc\" if you have spamd running.  See the spamc and
@@ -597,8 +587,6 @@ identification"
   :type 'string
   :group 'spam-spamassassin)
 
-(make-obsolete-variable 'spam-sa-learn-path 'spam-sa-learn-program
-                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-sa-learn-program (executable-find "sa-learn")
   "Name of the sa-learn program."
   :type '(choice (file :tag "Location of spamassassin")
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 23cc2baab79..82e28e8741d 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -88,7 +88,7 @@ the MH mail system."
 When desktop creates a buffer, DESKTOP-BUFFER-FILE-NAME holds the
 file name to visit, DESKTOP-BUFFER-NAME holds the desired buffer
 name, and DESKTOP-BUFFER-MISC holds a list of miscellaneous info
-used by the `desktop-buffer-handlers' functions."
+used by the `desktop-buffer-mode-handlers' functions."
   (mh-find-path)
   (mh-visit-folder desktop-buffer-name)
   (current-buffer))
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 57b748b1500..584d1a9d0d8 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -312,7 +312,7 @@ display a button."
 	(define-key map [return] 'goto-address-at-point)
 	(define-key map (if (featurep 'xemacs)
 			    [button2]
-			  [down-mouse-2]) 'goto-address-at-mouse)
+			  [down-mouse-2]) 'goto-address-at-point)
 	map))
 
 (set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap)
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 5321807cd6c..abfca383e09 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -116,8 +116,13 @@
   :type  'function
   :group 'quickurl)
 
-(defcustom quickurl-assoc-function #'assoc-ignore-case
+(defun quickurl--assoc-function (key alist)
+  "Default function for `quickurl-assoc-function'."
+  (assoc-string key alist t))
+
+(defcustom quickurl-assoc-function #'quickurl--assoc-function
   "Function to use for alist lookup into `quickurl-urls'."
+  :version "26.1"                 ; was the obsolete assoc-ignore-case
   :type  'function
   :group 'quickurl)
 
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 83f15d495b5..737dd9ea8a8 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1425,7 +1425,7 @@ Pascal Outline mode provides some additional commands.
 \\[pascal-show-all]\t- Show the whole buffer.
 \\[pascal-hide-other-defuns]\
 \t- Hide everything but the current function (function under the cursor).
-\\[pascal-outline]\t- Leave Pascal Outline mode."
+\\[pascal-outline-mode]\t- Leave Pascal Outline mode."
   :init-value nil :lighter " Outl" :keymap pascal-outline-map
   (add-to-invisibility-spec '(pascal . t))
   (unless pascal-outline-mode
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 9c1b471d484..e0e412e1626 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -272,7 +272,7 @@ Consult the selection.  Treat empty strings as if they were unset."
 (fset 'iconify-or-deiconify-frame 'ignore)
 
 ;; From lisp/frame.el
-(fset 'set-default-font 'ignore)
+(fset 'set-frame-font 'ignore)
 (fset 'set-mouse-color 'ignore)		; We cannot, I think.
 (fset 'set-cursor-color 'ignore)	; Hardware determined by char under.
 (fset 'set-border-color 'ignore)	; Not useful.
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 6637da4b144..9c158a5f569 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1096,7 +1096,7 @@ always show the current section in connection with the option
       (when (eq reftex-auto-recenter-toc 'frame)
         (unless reftex-toc-auto-recenter-timer
           (reftex-toggle-auto-toc-recenter))
-        (add-hook 'delete-frame-hook 'reftex-toc-delete-frame-hook)))))
+        (add-hook 'delete-frame-functions 'reftex-toc-delete-frame-hook)))))
 
 (defun reftex-toc-delete-frame-hook (frame)
   (if (and reftex-toc-auto-recenter-timer
diff --git a/lisp/woman.el b/lisp/woman.el
index 1a603dba2f0..c83a04874a5 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1759,8 +1759,8 @@ Leave point at end of new text.  Return length of inserted text."
 	   (condition-case ()
 	       (insert-file-contents filename nil)
 	     (file-error
-	      ;; Run find-file-not-found-hooks until one returns non-nil.
-	      ;; (run-hook-with-args-until-success 'find-file-not-found-hooks)
+	      ;; Run find-file-not-found-functions until one returns non-nil.
+	      ;; (run-hook-with-args-until-success 'find-file-not-found-functions)
 	      (insert "\n***** File " filename " not found! *****\n\n")))))))
 
 
diff --git a/src/frame.c b/src/frame.c
index fdde3d99a93..86caa32615d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1421,7 +1421,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
   /* We want to make sure that the next event generates a frame-switch
      event to the appropriate frame.  This seems kludgy to me, but
      before you take it out, make sure that evaluating something like
-     (select-window (frame-root-window (new-frame))) doesn't end up
+     (select-window (frame-root-window (make-frame))) doesn't end up
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
 #ifdef HAVE_WINDOW_SYSTEM