From 5deb0ec14f304658bce12809b5c4d97c62eca858 Mon Sep 17 00:00:00 2001 From: Stephen Gildea Date: Mon, 11 Oct 2021 18:19:18 -0700 Subject: [PATCH] * lisp/mh-e/mh-show.el (mh-junk-whitelist): Custom obsolescence message. --- lisp/mh-e/mh-junk.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el index 467667f5afd..2097bcbe1e8 100644 --- a/lisp/mh-e/mh-junk.el +++ b/lisp/mh-e/mh-junk.el @@ -110,8 +110,15 @@ message(s) as specified by the option `mh-junk-disposition'." ;;;###mh-autoload (defun mh-junk-whitelist (range) "Old name for `mh-junk-allowlist'; use \\[mh-junk-allowlist] instead." - (declare (obsolete mh-junk-allowlist "28.1")) (interactive (list (mh-interactive-range "Allowlist"))) + ;; We do our own message here instead of using "declare obsolete" + ;; in order to talk about keys instead of function names. Also, it + ;; lets us bind "J w" to this without the Emacs 29 compiler complaining. + (when (not (get 'mh-junk-whitelist 'command-execute-obsolete-warned)) + (message "%s is an obsolete key (as of 28.1); use %s instead" + (substitute-command-keys "\\[mh-junk-whitelist]") + (substitute-command-keys "\\[mh-junk-allowlist]")) + (put 'mh-junk-whitelist 'command-execute-obsolete-warned t)) (mh-junk-allowlist range)) ;;;###mh-autoload -- 2.39.2