Avoid messing up font-lock-global-modes.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb59a1283c4..f5addc9374a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-02-10  Glenn Morris  <rgm@gnu.org>
 
+        * speedbar.el: Avoid messing up font-lock-global-modes.
+
         * mail/mail-utils.el (mail-use-rfc822): Remove * from defcustom doc.
         (mail-file-babyl-p): Use with-temp-buffer.
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index ac10f53aa41..ca2c102b35b 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -4122,11 +4122,14 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
             (def-edebug-spec speedbar-with-writable def-body)))
 
 ;; Fix a font lock problem for some versions of Emacs
-(if (boundp 'font-lock-global-modes)
-    (if (listp font-lock-global-modes)
-        (add-to-list 'font-lock-global-modes '(not speedbar-mode))
-      )
-  )
+(and (boundp 'font-lock-global-modes)
+     font-lock-global-modes
+     (if (eq font-lock-global-modes t)
+         (setq font-lock-global-modes '(not speedbar-mode))
+       (if (eq (car font-lock-global-modes) 'not)
+           (add-to-list 'font-lock-global-modes 'speedbar-mode t))))
+;; If f-l-g-m is a non-empty list that doesn't begin with not, there
+;; is nothing we can do.
 
 
 ;;; Obsolete variables and functions