summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/mh-e/ChangeLog2
-rw-r--r--lisp/mh-e/mh-search.el7
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0f149f2b061..8200388b60a 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,7 @@
2006-02-01 Bill Wohler <wohler@newt.com>
+ * mh-search.el (which-func-mode): Shush compiler on Emacs 21 too.
+
* mh-alias.el (mh-alias-gecos-name): Use
mh-replace-regexp-in-string instead of replace-regexp-in-string.
(crm, multi-prompt): Use mh-require instead of require.
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index b58539c615c..f1292dd8e1e 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -51,7 +51,6 @@
(require 'gnus-util)
(require 'imenu)
-(mh-require 'which-func nil t)
(defvar mh-searcher nil
"Cached value of chosen search program.")
@@ -1410,8 +1409,12 @@ being the list of messages originally from that folder."
(when cur-msg (mh-goto-msg cur-msg t t))
(set-buffer-modified-p old-buffer-modified-flag)))
+(mh-require 'which-func nil t)
+
;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar which-func-mode)))
+(eval-when-compile
+ (if (or mh-xemacs-flag (< emacs-major-version 22))
+ (defvar which-func-mode)))
;;;###mh-autoload
(defun mh-index-create-imenu-index ()