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
author: Glenn Morris <rgm@gnu.org> 2018-03-08 08:29:14 -0800
committer: Glenn Morris <rgm@gnu.org> 2018-03-08 08:29:14 -0800
commit: 43548b51cb94c15af41b61b90172e05b9443a39b (patch)
tree: 02b92328987a8c98f4e73a4081fb310ae1c83693 /lisp
parent: 50e2c0fb5180a757d8d533518f68837ffe5909be (diff)
parent: cb0d40eab406e7df22b09f7ae5557c820c087af4 (diff)
download: emacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.gz
emacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.bz2
emacs-43548b51cb94c15af41b61b90172e05b9443a39b.zip
14 files changed, 21 insertions, 25 deletions
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")))))))
author	Glenn Morris <rgm@gnu.org>	2018-03-08 08:29:14 -0800
committer	Glenn Morris <rgm@gnu.org>	2018-03-08 08:29:14 -0800
commit	43548b51cb94c15af41b61b90172e05b9443a39b (patch)
tree	02b92328987a8c98f4e73a4081fb310ae1c83693 /lisp
parent	50e2c0fb5180a757d8d533518f68837ffe5909be (diff)
parent	cb0d40eab406e7df22b09f7ae5557c820c087af4 (diff)
download	emacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.gz emacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.bz2 emacs-43548b51cb94c15af41b61b90172e05b9443a39b.zip