(which-func-mode): Shush compiler on Emacs 21 too.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0f149f2b0611ef4a71b98cfd1f60128c28b4026c..8200388b60a294954ded0d531d48f1fd76c2b46c 100644 (file)
--- 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 b58539c615cdfb257451a156818ae18ca66462bf..f1292dd8e1ebd46f7f29fbfaf45d4d53735eeb93 100644 (file)
--- 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 ()