[Emacs-diffs] emacs/lisp ChangeLog speedbar.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/10 05:23:38

Modified files:
        lisp           : ChangeLog speedbar.el 

Log message:
        Avoid messing up font-lock-global-modes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15290&r2=1.15291
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/speedbar.el?cvsroot=emacs&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15290
retrieving revision 1.15291
diff -u -b -r1.15290 -r1.15291
--- ChangeLog   10 Feb 2009 03:57:10 -0000      1.15290
+++ ChangeLog   10 Feb 2009 05:23:35 -0000      1.15291
@@ -1,5 +1,7 @@
 2009-02-10  Glenn Morris  <address@hidden>
 
+       * 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.
 

Index: speedbar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/speedbar.el,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- speedbar.el 5 Jan 2009 03:19:46 -0000       1.101
+++ speedbar.el 10 Feb 2009 05:23:38 -0000      1.102
@@ -4122,11 +4122,14 @@
            (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