(speedbar-file-regexp): Give it a phony defvar before and a real

defvar after `speedbar-supported-extension-expressions'.  This is to
silence the compiler without breaking bootstrapping.

2 files changed, 17 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e70a3fd3fa3..a0dcde78786 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-22  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * speedbar.el (speedbar-file-regexp): Give it a phony defvar
+        before and a real defvar after
+        `speedbar-supported-extension-expressions'.  This is to silence
+        the compiler without breaking bootstrapping.
+
 2004-08-22  Richard M. Stallman  <rms@gnu.org>
 
         * textmodes/flyspell.el (flyspell-word): Use
@@ -30,9 +37,9 @@
         * ps-mule.el: Delete compatibility code for old Emacses.
         (ps-mule-find-wrappoint): Don't use chars-in-region.
 
-        * frame.el (display-mouse-p, display-selections-p): 
+        * frame.el (display-mouse-p, display-selections-p):
         Use with-no-warnings.
-        
+
         * font-lock.el (font-lock-set-defaults): Use with-no-warnings.
 
 2004-08-22  David Kastrup  <dak@gnu.org>
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 524a6d4f2f8..1a222e6004e 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -665,12 +665,8 @@ useful, such as version control."
   "*Regexp matching files we don't want displayed in a speedbar buffer.
 It is generated from the variable `completion-ignored-extensions'")
 
-;; This can't be further down, since it is needed just after.
-(defvar speedbar-file-regexp
-  (speedbar-extension-list-to-regex speedbar-supported-extension-expressions)
-  "Regular expression matching files we know how to expand.
-Created from `speedbar-supported-extension-expression' with the
-function `speedbar-extension-list-to-regex'")
+;; Ugly compiler silencing trick.  The real defvar comes later in this file.
+(defvar speedbar-file-regexp)
 
 ;; this is dangerous to customize, because the defaults will probably
 ;; change in the future.
@@ -698,6 +694,12 @@ file."
          (setq speedbar-supported-extension-expressions val
                speedbar-file-regexp (speedbar-extension-list-to-regex val))))
 
+(defvar speedbar-file-regexp
+  (speedbar-extension-list-to-regex speedbar-supported-extension-expressions)
+  "Regular expression matching files we know how to expand.
+Created from `speedbar-supported-extension-expression' with the
+function `speedbar-extension-list-to-regex'")
+
 (defcustom speedbar-scan-subdirs nil
   "*Non-nil means speedbar will check if subdirs are empty.
 That way you don't have to click on them to find out.  But this