From 870e392fc31da0f1c8a84c3196b16441908a3455 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 10 Sep 2020 01:32:24 +0200 Subject: [PATCH 1/2] Make M-x show obsolete commands * lisp/simple.el (read-extended-command): Don't hide obsolete commands. (read-extended-command--annotation): Show an annotation for obsolete commands that says what their new name is. --- lisp/simple.el | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 3b2b5c92e9..37e9a95bad 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1881,22 +1881,17 @@ read-extended-command '(metadata (annotation-function . read-extended-command--annotation) (category . command)) - (let ((pred - (if (memq action '(nil t)) - ;; Exclude obsolete commands from completions. - (lambda (sym) - (and (funcall pred sym) - (or (equal string (symbol-name sym)) - (not (get sym 'byte-obsolete-info))))) - pred))) - (complete-with-action action obarray string pred)))) + (complete-with-action action obarray string pred))) #'commandp t nil 'extended-command-history))) (defun read-extended-command--annotation (command-name) - (let* ((function (and (stringp command-name) (intern-soft command-name))) - (binding (where-is-internal function overriding-local-map t))) - (when (and binding (not (stringp binding))) - (format " (%s)" (key-description binding))))) + (let* ((fun (and (stringp command-name) (intern-soft command-name))) + (binding (where-is-internal fun overriding-local-map t)) + (obsolete (get fun 'byte-obsolete-info))) + (cond (obsolete + (format " (%s)" (car obsolete))) + ((and binding (not (stringp binding))) + (format " (%s)" (key-description binding)))))) (defcustom suggest-key-bindings t "Non-nil means show the equivalent key-binding when M-x command has one. -- 2.28.0