diff options
| author | Chong Yidong | 2009-06-19 14:22:39 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-06-19 14:22:39 +0000 |
| commit | 347437a5dcbdd4c5606b1ecdbe9ed90dab3d3e12 (patch) | |
| tree | 74ddee726d33ded63fa2439aeb751f87fa54f67c | |
| parent | ec7709ba14fdd45eb62ad88a233285a0147fc37c (diff) | |
| download | emacs-347437a5dcbdd4c5606b1ecdbe9ed90dab3d3e12.tar.gz emacs-347437a5dcbdd4c5606b1ecdbe9ed90dab3d3e12.zip | |
* 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'.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/font-core.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b91985ed3e..5d4b3c56040 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2009-06-19 David Casperson <casper@unbc.ca> (tiny change) | ||
| 2 | |||
| 3 | * font-core.el (turn-on-font-lock-if-desired): Correctly handle | ||
| 4 | the case where font-lock-global-modes is a list that doesn't begin | ||
| 5 | with `not'. | ||
| 6 | |||
| 1 | 2009-06-19 Glenn Morris <rgm@gnu.org> | 7 | 2009-06-19 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * subr.el (open-network-stream): Doc fix. | 9 | * 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." | |||
| 291 | t) | 291 | t) |
| 292 | ((eq (car-safe font-lock-global-modes) 'not) | 292 | ((eq (car-safe font-lock-global-modes) 'not) |
| 293 | (not (memq major-mode (cdr font-lock-global-modes)))) | 293 | (not (memq major-mode (cdr font-lock-global-modes)))) |
| 294 | (t (memq major-mode (cdr font-lock-global-modes)))) | 294 | (t (memq major-mode font-lock-global-modes))) |
| 295 | (let (inhibit-quit) | 295 | (let (inhibit-quit) |
| 296 | (turn-on-font-lock)))) | 296 | (turn-on-font-lock)))) |
| 297 | 297 | ||