From 8a7c280d81c8a8c902ce0b48f23772e3c2cc09b2 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 12 Oct 2021 13:29:28 +0200 Subject: [PATCH] Make mh-do-in-gnu-emacs obsolete * lisp/mh-e/mh-acros.el (mh-do-in-gnu-emacs): Make obsolete. * lisp/mh-e/mh-tool-bar.el: Don't use above obsolete macro. (mh-acros): Require to avoid warnings. Thanks to Lars Ingebrigtsen . --- lisp/mh-e/mh-acros.el | 7 ++----- lisp/mh-e/mh-tool-bar.el | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index d18579d7ea6..575b233e1be 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -47,16 +47,13 @@ ;;;###mh-autoload (defmacro mh-do-in-gnu-emacs (&rest body) "Execute BODY if in GNU Emacs." - ;; FIXME: This cannot yet be obsoleted, due to one remaining call in - ;; mh-tool-bar.el. Once that is removed, this can be obsoleted. - (declare ;; (obsolete nil "29.1") - (debug t) (indent defun)) + (declare (obsolete progn "29.1") (debug t) (indent defun)) (unless (featurep 'xemacs) `(progn ,@body))) ;;;###mh-autoload (defmacro mh-do-in-xemacs (&rest body) "Execute BODY if in XEmacs." - (declare (obsolete nil "29.1") (debug t) (indent defun)) + (declare (obsolete ignore "29.1") (debug t) (indent defun)) (when (featurep 'xemacs) `(progn ,@body))) ;;;###mh-autoload diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el index 22ed477b57c..ca08cc3b35d 100644 --- a/lisp/mh-e/mh-tool-bar.el +++ b/lisp/mh-e/mh-tool-bar.el @@ -27,10 +27,8 @@ ;;; Code: (require 'mh-e) -;; FIXME: Figure out why removing the call to the `mh-do-in-gnu-emacs' -;; macro here leads to errors. -(mh-do-in-gnu-emacs - (require 'tool-bar)) +(require 'mh-acros) +(require 'tool-bar) ;;; Tool Bar Commands -- 2.39.2