diff lisp/mh-e/mh-mime.el @ 70028:d81780942bb8

* mh-acros.el (struct, x, y): No need to wrap defvar with eval-when-compile when shushing compiler, even when mh-do-in-xemacs or another construct is used. * mh-comp.el (sendmail-coding-system): Ditto. * mh-e.el (mark-active): Ditto. * mh-folder.el (desktop-save-buffer, font-lock-auto-fontify) (image-load-path, font-lock-defaults): Ditto. * mh-letter.el (image-load-path, font-lock-defaults): Ditto. * mh-mime.el (dots, type, ov) (mm-verify-function-alist, mm-decrypt-function-alist) (pressed-details): Ditto. * mh-search.el (pick-folder, mh-do-in-xemacs) (mh-mairix-folder, mh-flists-search-folders) (which-func-mode, mh-speed-flists-inhibit-flag): Ditto. * mh-seq.el (tool-bar-mode): Ditto. * mh-utils.el (completion-root-regexp) (minibuffer-completing-file-name): Ditto. * mh-xface.el (default-enable-multibyte-characters): Ditto.

--- a/lisp/mh-e/mh-mime.el	Fri Apr 14 21:28:52 2006 +0000
+++ b/lisp/mh-e/mh-mime.el	Sat Apr 15 00:28:08 2006 +0000
@@ -825,7 +825,9 @@
 ;;; Button Display
 
 ;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar dots) (defvar type) (defvar ov)))
+(defvar dots)                           ; XEmacs
+(defvar type)                           ; XEmacs
+(defvar ov)                             ; XEmacs
 
 (defun mh-insert-mime-button (handle index displayed)
   "Insert MIME button for HANDLE.
@@ -870,12 +872,9 @@
       (mh-funcall-if-exists overlay-put ov 'evaporate t))))
 
 ;; Shush compiler.
-(eval-when-compile
-  (when (< emacs-major-version 22)
-    (defvar  mm-verify-function-alist)
-    (defvar  mm-decrypt-function-alist))
-  (mh-do-in-xemacs
-    (defvar pressed-details)))
+(defvar mm-verify-function-alist)       ; < Emacs 22
+(defvar mm-decrypt-function-alist)      ; < Emacs 22
+(defvar pressed-details)                ; XEmacs
 
 (defun mh-insert-mime-security-button (handle)
   "Display buttons for PGP message, HANDLE."