* mh-utils.el (mh-speed-flists-cache): Ditto
+ * 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.
+
* mh-compat.el (mh-font-lock-add-keywords): New alias for
font-lock-add-keywords. Returns nil on XEmacs.
(boundp 'mark-active) mark-active))))
;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar struct) (defvar x) (defvar y)))
+(defvar struct) ; XEmacs
+(defvar x) ; XEmacs
+(defvar y) ; XEmacs
;;;###mh-autoload
(defmacro mh-defstruct (name-spec &rest fields)
(setq other-headers (cdr other-headers)))))
;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar sendmail-coding-system)))
+(defvar sendmail-coding-system) ; XEmacs
;;;###autoload
(defun mh-send-letter (&optional arg)
(mh-exchange-point-and-mark-preserving-active-mark))
;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar mark-active)))
+(defvar mark-active) ; XEmacs
(defun mh-exchange-point-and-mark-preserving-active-mark ()
"Put the mark where point is now, and point where the mark is now.
(add-to-list 'which-func-modes 'mh-folder-mode))
;; Shush compiler.
-(eval-when-compile
- (defvar desktop-save-buffer)
- (defvar font-lock-auto-fontify)
- (defvar image-load-path)
- (mh-do-in-xemacs (defvar font-lock-defaults)))
+(defvar desktop-save-buffer)
+(defvar font-lock-auto-fontify)
+(defvar image-load-path)
+(defvar font-lock-defaults) ; XEmacs
(defvar mh-folder-buttons-init-flag nil)
(defvar mh-letter-buttons-init-flag nil)
;; Shush compiler.
-(eval-when-compile
- (defvar image-load-path)
- (mh-do-in-xemacs (defvar font-lock-defaults)))
+(defvar image-load-path)
+(defvar font-lock-defaults) ; XEmacs
;; Ensure new buffers won't get this mode if default-major-mode is nil.
(put 'mh-letter-mode 'mode-class 'special)
;;; 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.
(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."
count (> (hash-table-count msg-hash) 0)))))))
;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar pick-folder)))
+(defvar pick-folder) ; XEmacs
(defun mh-search-folder (folder window-config)
"Search FOLDER for messages matching a pattern.
(mh-index-sequenced-messages folders mh-tick-seq))
;; Shush compiler.
-(eval-when-compile
- (mh-do-in-xemacs
- (defvar mh-mairix-folder)
- (defvar mh-flists-search-folders)))
+(defvar mh-mairix-folder) ; XEmacs
+(defvar mh-flists-search-folders) ; XEmacs
;;;###mh-autoload
(defun mh-index-sequenced-messages (folders sequence)
(mh-require 'which-func nil t)
;; Shush compiler.
-(eval-when-compile
- (if (or mh-xemacs-flag (< emacs-major-version 22))
- (defvar which-func-mode)))
+(defvar which-func-mode) ; < Emacs 22, XEmacs
;;;###mh-autoload
(defun mh-index-create-imenu-index ()
mh-index-data)
;; Shush compiler
-(eval-when-compile (if mh-xemacs-flag (defvar mh-speed-flists-inhibit-flag)))
+(defvar mh-speed-flists-inhibit-flag) ; XEmacs
;;;###mh-autoload
(defun mh-index-execute-commands ()
" "))))
;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar tool-bar-mode)))
+(defvar tool-bar-mode) ; XEmacs
;;;###mh-autoload
(defun mh-narrow-to-seq (sequence)
(t (file-exists-p path))))))))
;; Shush compiler.
-(eval-when-compile
- (mh-do-in-xemacs
- (defvar completion-root-regexp)
- (defvar minibuffer-completing-file-name)))
+(defvar completion-root-regexp) ; XEmacs
+(defvar minibuffer-completing-file-name) ; XEmacs
(defun mh-folder-completing-read (prompt default allow-root-folder-flag)
"Read folder name with PROMPT and default result DEFAULT.
(funcall mh-show-xface-function)))
;; Shush compiler.
-(eval-when-compile
- (mh-do-in-xemacs (defvar default-enable-multibyte-characters)))
+(defvar default-enable-multibyte-characters) ; XEmacs
(defun mh-face-display-function ()
"Display a Face, X-Face, or X-Image-URL header field.