Avoid messing up font-lock-global-modes.

0aeb3666 · Glenn Morris · a35462a1 · 0aeb3666 · 0aeb3666
Commit 0aeb3666 authored Feb 10, 2009 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

lisp/ChangeLog lisp/ChangeLog +2 -0

lisp/speedbar.el lisp/speedbar.el +8 -5

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
 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.
  

--- 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