Declare compat macro mh-do-in-gnu-emacs obsolete

* lisp/mh-e/mh-acros.el (mh-do-in-gnu-emacs): Declare compat macro
obsolete.
* lisp/mh-e/mh-compat.el (mh-require):
* lisp/mh-e/mh-folder.el (mh-folder-mode):
* lisp/mh-e/mh-letter.el (mh-letter-mode):
* lisp/mh-e/mh-mime.el (mh-mime-button-map)
(mh-mime-security-button-map, mh-small-image-p)
(mh-signature-highlight):
* lisp/mh-e/mh-show.el (mh-show-mode):
* lisp/mh-e/mh-tool-bar.el (mh-tool-bar-define):
* lisp/mh-e/mh-utils.el (mh-logo-display)
(mh-hidden-header-keymap):
* lisp/mh-e/mh-xface.el (mh-face-display-function)
(mh-picon-image-types, mh-x-image-display): Don't wrap code in
compat macro 'mh-do-in-gnu-emacs'.

1 files changed, 13 insertions, 15 deletions

diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 1e244b54273..137e45ba7a5 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -127,19 +127,18 @@ Ignores case when searching for OLD."
 ;;;###mh-autoload
 (defun mh-logo-display ()
   "Modify mode line to display MH-E logo."
-  (mh-do-in-gnu-emacs
-    (let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm"))
-           (image-load-path (cons (car load-path)
-                                  (when (boundp 'image-load-path)
-                                    image-load-path))))
-      (add-text-properties
-       0 2
-       `(display ,(or mh-logo-cache
-                      (setq mh-logo-cache
-                            (mh-funcall-if-exists
-                             find-image '((:type xpm :ascent center
-                                                 :file "mh-logo.xpm"))))))
-       (car mode-line-buffer-identification)))))
+  (let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm"))
+         (image-load-path (cons (car load-path)
+                                (when (boundp 'image-load-path)
+                                  image-load-path))))
+    (add-text-properties
+     0 2
+     `(display ,(or mh-logo-cache
+                    (setq mh-logo-cache
+                          (mh-funcall-if-exists
+                           find-image '((:type xpm :ascent center
+                                               :file "mh-logo.xpm"))))))
+     (car mode-line-buffer-identification))))
 
 
 
@@ -913,8 +912,7 @@ Handle RFC 822 (or later) continuation lines."
 
 (defvar mh-hidden-header-keymap
   (let ((map (make-sparse-keymap)))
-    (mh-do-in-gnu-emacs
-      (define-key map [mouse-2] #'mh-letter-toggle-header-field-display-button))
+    (define-key map [mouse-2] #'mh-letter-toggle-header-field-display-button)
     map))
 
 ;;;###mh-autoload