From: Dave Love <fx@gnu.org>
Date: Mon, 30 Oct 2000 19:59:09 +0000 (+0000)
Subject: (imenu-generic-expression)
X-Git-Tag: emacs-pretest-21.0.90~405
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=234be340d871b2e5d069bc53ec04fbe276f3e8f8;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7217e9aac54..ba0e81ba3f3 100644
--- 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 5504a4b04aa..9bfe6ee3098 100644
--- 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))