Mercurial > emacs
changeset 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.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Sat, 15 Apr 2006 00:28:08 +0000 |
| parents | 0e0916499a15 |
| children | 14a3b2b9c00b |
| files | lisp/mh-e/ChangeLog lisp/mh-e/mh-acros.el lisp/mh-e/mh-comp.el lisp/mh-e/mh-e.el lisp/mh-e/mh-folder.el lisp/mh-e/mh-letter.el lisp/mh-e/mh-mime.el lisp/mh-e/mh-search.el lisp/mh-e/mh-seq.el lisp/mh-e/mh-utils.el lisp/mh-e/mh-xface.el |
| diffstat | 11 files changed, 54 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/ChangeLog Sat Apr 15 00:28:08 2006 +0000 @@ -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.
--- a/lisp/mh-e/mh-acros.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-acros.el Sat Apr 15 00:28:08 2006 +0000 @@ -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)
--- a/lisp/mh-e/mh-comp.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-comp.el Sat Apr 15 00:28:08 2006 +0000 @@ -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)
--- a/lisp/mh-e/mh-e.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-e.el Sat Apr 15 00:28:08 2006 +0000 @@ -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.
--- a/lisp/mh-e/mh-folder.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-folder.el Sat Apr 15 00:28:08 2006 +0000 @@ -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)
--- a/lisp/mh-e/mh-letter.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-letter.el Sat Apr 15 00:28:08 2006 +0000 @@ -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)
--- 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."
--- a/lisp/mh-e/mh-search.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-search.el Sat Apr 15 00:28:08 2006 +0000 @@ -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 ()
--- a/lisp/mh-e/mh-seq.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-seq.el Sat Apr 15 00:28:08 2006 +0000 @@ -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)
--- a/lisp/mh-e/mh-utils.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-utils.el Sat Apr 15 00:28:08 2006 +0000 @@ -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.
--- a/lisp/mh-e/mh-xface.el Fri Apr 14 21:28:52 2006 +0000 +++ b/lisp/mh-e/mh-xface.el Sat Apr 15 00:28:08 2006 +0000 @@ -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.