From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 19 Jun 2009 14:22:39 +0000 (+0000)
Subject: * font-core.el (turn-on-font-lock-if-desired): Correctly handle
X-Git-Tag: emacs-pretest-23.0.95~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=347437a5dcbdd4c5606b1ecdbe9ed90dab3d3e12;p=emacs.git

* 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 6b91985ed3e..5d4b3c56040 100644
--- 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 b94c0804846..88c67d8dece 100644
--- 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))))