[Emacs-commit] emacs/lisp/mh-e mh-xface.el mh-utils.el mh-seq....

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/04/15 00:28:09

Modified files:
        lisp/mh-e      : mh-xface.el mh-utils.el mh-seq.el mh-search.el 
                         mh-mime.el mh-letter.el mh-folder.el mh-e.el 
                         mh-comp.el mh-acros.el ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-xface.el.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-utils.el.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-seq.el.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-search.el.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-mime.el.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-letter.el.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-folder.el.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-e.el.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-comp.el.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-acros.el.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.200&tr2=1.201&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.200 emacs/lisp/mh-e/ChangeLog:1.201
--- emacs/lisp/mh-e/ChangeLog:1.200     Fri Apr 14 21:28:52 2006
+++ emacs/lisp/mh-e/ChangeLog   Sat Apr 15 00:28:08 2006
@@ -11,6 +11,34 @@
 
        * 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.  
 
Index: emacs/lisp/mh-e/mh-acros.el
diff -u emacs/lisp/mh-e/mh-acros.el:1.18 emacs/lisp/mh-e/mh-acros.el:1.19
--- emacs/lisp/mh-e/mh-acros.el:1.18    Tue Jan 31 20:46:15 2006
+++ emacs/lisp/mh-e/mh-acros.el Sat Apr 15 00:28:08 2006
@@ -130,7 +130,9 @@
                (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)
Index: emacs/lisp/mh-e/mh-comp.el
diff -u emacs/lisp/mh-e/mh-comp.el:1.51 emacs/lisp/mh-e/mh-comp.el:1.52
--- emacs/lisp/mh-e/mh-comp.el:1.51     Sun Mar 19 20:21:58 2006
+++ emacs/lisp/mh-e/mh-comp.el  Sat Apr 15 00:28:08 2006
@@ -215,7 +215,7 @@
       (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)
Index: emacs/lisp/mh-e/mh-e.el
diff -u emacs/lisp/mh-e/mh-e.el:1.90 emacs/lisp/mh-e/mh-e.el:1.91
--- emacs/lisp/mh-e/mh-e.el:1.90        Fri Apr 14 18:49:18 2006
+++ emacs/lisp/mh-e/mh-e.el     Sat Apr 15 00:28:08 2006
@@ -623,7 +623,7 @@
   (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.
Index: emacs/lisp/mh-e/mh-folder.el
diff -u emacs/lisp/mh-e/mh-folder.el:1.11 emacs/lisp/mh-e/mh-folder.el:1.12
--- emacs/lisp/mh-e/mh-folder.el:1.11   Tue Mar 28 18:35:14 2006
+++ emacs/lisp/mh-e/mh-folder.el        Sat Apr 15 00:28:08 2006
@@ -522,11 +522,10 @@
   (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)
 
Index: emacs/lisp/mh-e/mh-letter.el
diff -u emacs/lisp/mh-e/mh-letter.el:1.11 emacs/lisp/mh-e/mh-letter.el:1.12
--- emacs/lisp/mh-e/mh-letter.el:1.11   Wed Mar 15 17:03:58 2006
+++ emacs/lisp/mh-e/mh-letter.el        Sat Apr 15 00:28:08 2006
@@ -278,9 +278,8 @@
 (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)
Index: emacs/lisp/mh-e/mh-mime.el
diff -u emacs/lisp/mh-e/mh-mime.el:1.52 emacs/lisp/mh-e/mh-mime.el:1.53
--- emacs/lisp/mh-e/mh-mime.el:1.52     Fri Apr 14 21:28:52 2006
+++ emacs/lisp/mh-e/mh-mime.el  Sat Apr 15 00:28:08 2006
@@ -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."
Index: emacs/lisp/mh-e/mh-search.el
diff -u emacs/lisp/mh-e/mh-search.el:1.10 emacs/lisp/mh-e/mh-search.el:1.11
--- emacs/lisp/mh-e/mh-search.el:1.10   Mon Mar  6 05:21:41 2006
+++ emacs/lisp/mh-e/mh-search.el        Sat Apr 15 00:28:08 2006
@@ -324,7 +324,7 @@
                        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.
@@ -404,10 +404,8 @@
   (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)
@@ -1414,9 +1412,7 @@
 (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 ()
@@ -1441,7 +1437,7 @@
   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 ()
Index: emacs/lisp/mh-e/mh-seq.el
diff -u emacs/lisp/mh-e/mh-seq.el:1.30 emacs/lisp/mh-e/mh-seq.el:1.31
--- emacs/lisp/mh-e/mh-seq.el:1.30      Fri Apr 14 21:28:52 2006
+++ emacs/lisp/mh-e/mh-seq.el   Sat Apr 15 00:28:08 2006
@@ -202,7 +202,7 @@
                         " "))))
 
 ;; 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)
Index: emacs/lisp/mh-e/mh-utils.el
diff -u emacs/lisp/mh-e/mh-utils.el:1.64 emacs/lisp/mh-e/mh-utils.el:1.65
--- emacs/lisp/mh-e/mh-utils.el:1.64    Fri Apr 14 21:28:52 2006
+++ emacs/lisp/mh-e/mh-utils.el Sat Apr 15 00:28:08 2006
@@ -718,10 +718,8 @@
                    (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.
Index: emacs/lisp/mh-e/mh-xface.el
diff -u emacs/lisp/mh-e/mh-xface.el:1.3 emacs/lisp/mh-e/mh-xface.el:1.4
--- emacs/lisp/mh-e/mh-xface.el:1.3     Tue Jan 31 20:46:15 2006
+++ emacs/lisp/mh-e/mh-xface.el Sat Apr 15 00:28:08 2006
@@ -60,8 +60,7 @@
     (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.