* font-core.el (turn-on-font-lock-if-desired): Correctly handle

the case where font-lock-global-modes is a list that doesn't begin
with `not'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b91985ed3e2be4fbed7c4f6b8d7aaaf5787e0ac..5d4b3c56040b81a02edf39d3ef9c8ea8be768d6f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-19  David Casperson  <casper@unbc.ca>  (tiny change)
+
+       * font-core.el (turn-on-font-lock-if-desired): Correctly handle
+       the case where font-lock-global-modes is a list that doesn't begin
+       with `not'.
+
 2009-06-19  Glenn Morris  <rgm@gnu.org>
 
        * subr.el (open-network-stream): Doc fix.

diff --git a/lisp/font-core.el b/lisp/font-core.el
index b94c0804846082a5d33f473aa0fac7dda1a5f9f3..88c67d8dece5a1cdb591dec53ecd183568d43028 100644 (file)
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -291,7 +291,7 @@ means that Font Lock mode is turned on for buffers in C and C++ modes only."
               t)
              ((eq (car-safe font-lock-global-modes) 'not)
               (not (memq major-mode (cdr font-lock-global-modes))))
-             (t (memq major-mode (cdr font-lock-global-modes))))
+             (t (memq major-mode font-lock-global-modes)))
     (let (inhibit-quit)
       (turn-on-font-lock))))