(imenu-generic-expression)

(imenu-progress-message): Only defvar when compiling.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7217e9aac54390a3a963117de308327857c25b55..ba0e81ba3f33a54c76214218680b513ff8e88ba0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-30  Dave Love  <fx@gnu.org>
+
+       * progmodes/cc-menus.el (imenu-generic-expression)
+       (imenu-progress-message): Only defvar when compiling.
+
 2000-10-30  Stefan Monnier  <monnier@cs.yale.edu>
 
        * log-edit.el (log-edit-confirm): Fix the default.

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 5504a4b04aa4ed22943e1d4a8d8526c72ebcbd3f..9bfe6ee309840622935dea45ad37a8f7211ef093 100644 (file)
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -39,8 +39,9 @@
     (load "cc-defs" nil t)))
 
 ;; Dummy definitions to shut up the compiler in case imenu doesn't exist.
-(defvar imenu-generic-expression)
-(defvar imenu-case-fold-search)
+(eval-when-compile
+  (defvar imenu-generic-expression)
+  (defvar imenu-case-fold-search))
 (or (fboundp 'imenu-progress-message)
     (defun imenu-progress-message (&rest args) nil))