[Emacs-commit] emacs/lisp/mh-e mh-search.el ChangeLog

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/02/01 23:37:26

Modified files:
        lisp/mh-e      : mh-search.el ChangeLog 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-search.el.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.132&tr2=1.133&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.132 emacs/lisp/mh-e/ChangeLog:1.133
--- emacs/lisp/mh-e/ChangeLog:1.132     Wed Feb  1 23:24:34 2006
+++ emacs/lisp/mh-e/ChangeLog   Wed Feb  1 23:37:26 2006
@@ -1,5 +1,7 @@
 2006-02-01  Bill Wohler  <address@hidden>
 
+       * 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.
Index: emacs/lisp/mh-e/mh-search.el
diff -u emacs/lisp/mh-e/mh-search.el:1.7 emacs/lisp/mh-e/mh-search.el:1.8
--- emacs/lisp/mh-e/mh-search.el:1.7    Wed Feb  1 23:24:34 2006
+++ emacs/lisp/mh-e/mh-search.el        Wed Feb  1 23:37:26 2006
@@ -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 @@
     (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 ()