Merge from origin/emacs-28

66b8dfd060 (origin/emacs-28) ; Fix last change related to shorthands
3832b983cf In Fdelete_other_windows_internal fix new total window siz...
5deb0ec14f * lisp/mh-e/mh-show.el (mh-junk-whitelist): Custom obsoles...
cf1409db71 Don't apply shorthands to punctuation-only symbols (bug#51...
b3d0f53b29 * lisp/progmodes/python.el: Bump package version to 0.28.

1 files changed, 8 insertions, 1 deletions

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