From: Stefan Kangas Date: Tue, 11 Mar 2025 20:20:38 +0000 (+0100) Subject: Remove variable aliases obsolete since Emacs 23.2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac4367863b89debda4a75948ba3aebf077ee365d;p=emacs.git 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 ad00abadc50..32743edd6b3 100644 --- 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 0b5f1f2f939..06c627c3cda 100644 --- 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 " " #'dired-undo - " " #'dired-undo " " #'dired-vc-next-action " " #'filet ;; thumbnail manipulation (image-dired) @@ -3022,9 +3021,6 @@ directory in another window." (concat "File no longer exists; type \\" "\\[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 7f8a4a78163..b5ee4e34dbb 100644 --- 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 84939934812..b94f0dc424e 100644 --- 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 ae20a53d632..a7cdd3b1c13 100644 --- 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 - " " #'decipher-undo - " " #'decipher-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 798b0db78f0..0c309358631 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el @@ -153,8 +153,7 @@ SHOULD be at least 2 (MUST BE at least 1).") " " #'gomoku-move-down " " #'gomoku-beginning-of-line " " #'gomoku-end-of-line - " " #'gomoku-human-takes-back - " " #'gomoku-human-takes-back) + " " #'gomoku-human-takes-back) (defvar gomoku-emacs-won () diff --git a/lisp/proced.el b/lisp/proced.el index 96466a64f30..04a25e5ea64 100644 --- 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 " " #'proced-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 5e9fedb6e16..0fc3901815e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3245,9 +3245,6 @@ the minibuffer contents." minibuffer-prompt-properties)))) -;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 eaaa9f89bad..e8f19b18d7d 100644 --- 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)))