Remove variable aliases obsolete since Emacs 23.2

* lisp/dired.el (dired-advertised-find-file):
* lisp/simple.el (advertised-undo):
* lisp/wid-edit.el (advertised-widget-backward): Remove variable
aliases obsolete since Emacs 23.2.  They are replaced by
':advertised-binding' properties.
* lisp/arc-mode.el (archive-mode-map):
* lisp/dired.el (dired-mode-map):
* lisp/obsolete/landmark.el (landmark-mode-map):
* lisp/play/decipher.el (decipher-mode-map):
* lisp/play/gomoku.el (gomoku-mode-map):
* lisp/proced.el (proced-mode-map): Don't bind above removed commands.

(cherry picked from commit af851dd82e465a3e5e28065b35332ad35162beab)

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index ad00abadc503d53b6d9fe10f31598e9c79204cba..32743edd6b3d741e1ee62f6d86af6a0d3f7c1b26 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -444,7 +444,6 @@ be added."
     ;; Let mouse-1 follow the link.
     (define-key map [follow-link] 'mouse-face)
 
-    (define-key map [remap advertised-undo] #'archive-undo)
     (define-key map [remap undo] #'archive-undo)
 
     (define-key map [mouse-2] 'archive-extract)

diff --git a/lisp/dired.el b/lisp/dired.el
index 0b5f1f2f9398f8dd7bdf4e516f48b59d0dc6c241..06c627c3cda16df2456092d449d14355ebb975b0 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2432,7 +2432,6 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
   "?"       #'dired-summary
   "DEL"     #'dired-unmark-backward
   "<remap> <undo>"             #'dired-undo
-  "<remap> <advertised-undo>"  #'dired-undo
   "<remap> <vc-next-action>"   #'dired-vc-next-action
   "<remap> <yank>"             #'filet
   ;; thumbnail manipulation (image-dired)
@@ -3022,9 +3021,6 @@ directory in another window."
                 (concat "File no longer exists; type \\<dired-mode-map>"
                         "\\[revert-buffer] to update Dired buffer")))))))
 
-;; Force C-m keybinding rather than `f' or `e' in the mode doc:
-(define-obsolete-function-alias 'dired-advertised-find-file
-  #'dired-find-file "23.2")
 (defun dired-find-file ()
   "In Dired, visit the file or directory named on this line."
   (interactive nil dired-mode)

diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index 7f8a4a781633249ed42f4b184b00fd689d490621..b5ee4e34dbbd0f89515e2619f77046f01ee43661 100644 (file)
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -30,7 +30,7 @@
 (with-suppressed-warnings ((lexical pi))
   (defconst pi float-pi
     "Obsolete since Emacs-23.3.  Use `float-pi' instead."))
-(make-obsolete-variable 'pi 'float-pi "23.3")
+(make-obsolete-variable 'pi 'float-pi "23.3") ; "28.1"
 (internal-make-var-non-special 'pi)
 
 (defconst float-e (exp 1) "The value of e (2.7182818...).")

diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el
index 849399348128e128e15a67ef43ad8445834bc28f..b94f0dc424eef890f9841be5bd37595cf0510d95 100644 (file)
--- a/lisp/obsolete/landmark.el
+++ b/lisp/obsolete/landmark.el
@@ -206,7 +206,6 @@
     (define-key map [remap beginning-of-line] #'landmark-beginning-of-line)
     (define-key map [remap end-of-line] #'landmark-end-of-line)
     (define-key map [remap undo] #'landmark-human-takes-back)
-    (define-key map [remap advertised-undo] #'landmark-human-takes-back)
     map)
   "Local keymap to use in Landmark mode.")
 

diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index ae20a53d632493055157b0de88f26d6ea378066d..a7cdd3b1c13fd4779f1eab5c6cb655ed4212290f 100644 (file)
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -150,8 +150,7 @@ the tail of the list."
   "R"   #'decipher-restore-checkpoint
   "U"   #'decipher-undo
   "SPC" #'decipher-keypress
-  "<remap> <undo>" #'decipher-undo
-  "<remap> <advertised-undo>" #'decipher-undo)
+  "<remap> <undo>" #'decipher-undo)
 (let ((key ?a))
   (while (<= key ?z)
     (keymap-set decipher-mode-map (char-to-string key) #'decipher-keypress)

diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 798b0db78f0df737d7a23f91504ad9270d43a836..0c30935863197ac4ba28ef0cde975378a5a00bfc 100644 (file)
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -153,8 +153,7 @@ SHOULD be at least 2 (MUST BE at least 1).")
   "<remap> <next-line>"              #'gomoku-move-down
   "<remap> <move-beginning-of-line>" #'gomoku-beginning-of-line
   "<remap> <move-end-of-line>"       #'gomoku-end-of-line
-  "<remap> <undo>"                   #'gomoku-human-takes-back
-  "<remap> <advertised-undo>"        #'gomoku-human-takes-back)
+  "<remap> <undo>"                   #'gomoku-human-takes-back)
 
 
 (defvar gomoku-emacs-won ()

diff --git a/lisp/proced.el b/lisp/proced.el
index 96466a64f30f1bb374e71518fc9df76e5e12828f..04a25e5ea645d0623068b92d40a90899d361bb8b 100644 (file)
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -655,7 +655,6 @@ Important: the match ends just after the marker.")
   "h"         #'describe-mode
   "?"         #'proced-help
   "<remap> <undo>"            #'proced-undo
-  "<remap> <advertised-undo>" #'proced-undo
   ;; Additional keybindings are inherited from `special-mode-map'
   )
 (put 'proced-mark :advertised-binding "m")

diff --git a/lisp/simple.el b/lisp/simple.el
index 5e9fedb6e16a0014b8a6d202e0ebdea9d8bb05fc..0fc3901815e747794e4f8d994507f2d5c554d64e 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3245,9 +3245,6 @@ the minibuffer contents."
                                minibuffer-prompt-properties))))
 
 \f
-;Put this on C-x u, so we can force that rather than C-_ into startup msg
-(define-obsolete-function-alias 'advertised-undo 'undo "23.2")
-
 (defconst undo-equiv-table (make-hash-table :test 'eq :weakness t)
   "Table mapping redo records to the corresponding undo one.
 A redo record for an undo in region maps to `undo-in-region'.

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index eaaa9f89bad6f0593c18a4877e1364bd65aec224..e8f19b18d7d4595391097797466103adbba04031 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1094,12 +1094,6 @@ button end points."
 
 ;;; Keymap and Commands.
 
-;; This alias exists only so that one can choose in doc-strings (e.g.
-;; Custom-mode) which key-binding of widget-keymap one wants to refer to.
-;; https://lists.gnu.org/r/emacs-devel/2008-11/msg00480.html
-(define-obsolete-function-alias 'advertised-widget-backward
-  #'widget-backward "23.2")
-
 ;;;###autoload
 (defvar widget-keymap
   (let ((map (make-sparse-keymap)))