* mh-acros.el, mh-comp.el, mh-e.el, mh-folder.el, mh-letter.el:

* mh-mime.el, mh-search.el, mh-seq.el: Shush XEmacs compiler in
mh-do-in-xemacs block.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index f52a799653d43a2fdb6f8a1fc6c84a0fbb47ffc8..38ee394126092447d36029b9a556419ec9b65652 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-04  Bill Wohler  <wohler@newt.com>
 
+       * mh-acros.el,  mh-comp.el, mh-e.el, mh-folder.el, mh-letter.el:
+       * mh-mime.el, mh-search.el, mh-seq.el: Shush XEmacs compiler in
+       mh-do-in-xemacs block.
+
        * mh-compat.el (mh-window-full-height-p): Add compatibility
        function for XEmacs.
        * mh-show.el (mh-show-msg): Use it, and avoid compiler warning on

diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index c1964d5a4ea90acbd1b1f6669735376409af6fa3..2144eef730809875d8dad3bce101e499ace96e09 100644 (file)
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -132,9 +132,10 @@ check if variable `transient-mark-mode' is active."
                (boundp 'mark-active) mark-active))))
 
 ;; Shush compiler.
-(defvar struct)                         ; XEmacs
-(defvar x)                              ; XEmacs
-(defvar y)                              ; XEmacs
+(mh-do-in-xemacs
+  (defvar struct)
+  (defvar x)
+  (defvar y))
 
 ;;;###mh-autoload
 (defmacro mh-defstruct (name-spec &rest fields)

diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 169679e88ae0fcb244459389781033bb523b0033..1aa57316f50bbb6a4e9f23f906dbbdfcbc95d0e7 100644 (file)
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -223,7 +223,8 @@ RETURN-ACTION are ignored."
       (setq other-headers (cdr other-headers)))))
 
 ;; Shush compiler.
-(defvar sendmail-coding-system)         ; XEmacs
+(mh-do-in-xemacs
+  (defvar sendmail-coding-system))
 
 ;;;###autoload
 (defun mh-send-letter (&optional arg)

diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 90803d183d274e78724b4495dbedf3a92ad14034..eae7529e4d4b4fc1e0ac29a4dd66b43d7caa252b 100644 (file)
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -616,7 +616,8 @@ Output is expected to be shown to user, not parsed by MH-E."
   (mh-exchange-point-and-mark-preserving-active-mark))
 
 ;; Shush compiler.
-(defvar mark-active)                    ; XEmacs
+(mh-do-in-xemacs
+  (defvar mark-active))
 
 (defun mh-exchange-point-and-mark-preserving-active-mark ()
   "Put the mark where point is now, and point where the mark is now.

diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index b73cc14369a9daf67a774b680044fdc3ceb3e558..40febd641de9176a7135ecd4cbd28753acaa5e57 100644 (file)
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -526,7 +526,8 @@ font-lock is done highlighting.")
 ;; Shush compiler.
 (defvar desktop-save-buffer)
 (defvar font-lock-auto-fontify)
-(defvar font-lock-defaults)             ; XEmacs
+(mh-do-in-xemacs
+  (defvar font-lock-defaults))
 
 ;; Ensure new buffers won't get this mode if default major-mode is nil.
 (put 'mh-folder-mode 'mode-class 'special)

diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 494030ecc8415540dc6a7f3bd59ff9b4f156f65b..f269faf3a51841b57943597d74d91be35c2d30da 100644 (file)
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -273,7 +273,8 @@ searching for `mh-mail-header-separator' in the buffer."
 ;;; MH-Letter Mode
 
 ;; Shush compiler.
-(defvar font-lock-defaults)             ; XEmacs
+(mh-do-in-xemacs
+  (defvar font-lock-defaults))
 
 ;; Ensure new buffers won't get this mode if default major-mode is nil.
 (put 'mh-letter-mode 'mode-class 'special)

diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 1cdafffa45c94f9357caf4abe9a1eac84aa50119..25554b7822e31e8afa7380eded4a2bce1a823228 100644 (file)
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -885,7 +885,8 @@ by commands like \"K v\" which operate on individual MIME parts."
 ;; Shush compiler.
 (defvar mm-verify-function-alist)       ; < Emacs 22
 (defvar mm-decrypt-function-alist)      ; < Emacs 22
-(defvar pressed-details)                ; XEmacs
+(mh-do-in-xemacs
+  (defvar pressed-details))
 
 (defun mh-insert-mime-security-button (handle)
   "Display buttons for PGP message, HANDLE."

diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index a90a26ab2a45962b351895a2eea88a0cf7b1a763..1e764291f5d7818751bbfd901867657fe8f60a79 100644 (file)
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -321,7 +321,8 @@ folder containing the index search results."
                        count (> (hash-table-count msg-hash) 0)))))))
 
 ;; Shush compiler.
-(defvar pick-folder)                    ; XEmacs
+(mh-do-in-xemacs
+  (defvar pick-folder))
 
 (defun mh-search-folder (folder window-config)
   "Search FOLDER for messages matching a pattern.
@@ -401,8 +402,9 @@ or nothing to search all folders."
   (mh-index-sequenced-messages folders mh-tick-seq))
 
 ;; Shush compiler.
-(defvar mh-mairix-folder)               ; XEmacs
-(defvar mh-flists-search-folders)       ; XEmacs
+(mh-do-in-xemacs
+  (defvar mh-mairix-folder)
+  (defvar mh-flists-search-folders))
 
 ;;;###mh-autoload
 (defun mh-index-sequenced-messages (folders sequence)
@@ -1442,7 +1444,8 @@ being the list of messages originally from that folder."
   mh-index-data)
 
 ;; Shush compiler
-(defvar mh-speed-flists-inhibit-flag)   ; XEmacs
+(mh-do-in-xemacs
+  (defvar mh-speed-flists-inhibit-flag))
 
 ;;;###mh-autoload
 (defun mh-index-execute-commands ()

diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 145b689c6b9fb4a1bf7dff6f0f6bcd98d782560d..fc3e5c08143aeb45db68f07822a6ac7b236a97ba 100644 (file)
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -198,7 +198,8 @@ MESSAGE appears."
                         " "))))
 
 ;; Shush compiler.
-(defvar tool-bar-mode)                  ; XEmacs
+(mh-do-in-xemacs
+  (defvar tool-bar-mode))
 (defvar tool-bar-map)
 
 ;;;###mh-autoload