diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 16:08:41 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 16:08:41 -0400 |
| commit | 2a64315a111fb4da67e9c40c9b69045c4f63d619 (patch) | |
| tree | 2e7ba99465f6eb5eae64361767af5bc5fff7aca4 /lisp/font-lock.el | |
| parent | 288cf4e907c0350eb24824016763bddd09df8ea8 (diff) | |
| parent | 36901266a8acb83880fefee50c93abb09f64533b (diff) | |
| download | emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/font-lock.el')
| -rw-r--r-- | lisp/font-lock.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 7e8562c433a..db665857fdb 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1783,15 +1783,18 @@ preserve `hi-lock-mode' highlighting patterns." (kill-local-variable 'font-lock-set-defaults) (font-lock-mode 1)) -(defvar font-lock-mode-major-mode) +(defvar font-lock-major-mode nil + "Major mode for which the font-lock settings have been setup.") +(make-variable-buffer-local 'font-lock-major-mode) + (defun font-lock-set-defaults () "Set fontification defaults appropriately for this mode. Sets various variables using `font-lock-defaults' (or, if nil, using `font-lock-defaults-alist') and `font-lock-maximum-decoration'." ;; Set fontification defaults if not previously set for correct major mode. (unless (and font-lock-set-defaults - (eq font-lock-mode-major-mode major-mode)) - (setq font-lock-mode-major-mode major-mode) + (eq font-lock-major-mode major-mode)) + (setq font-lock-major-mode major-mode) (set (make-local-variable 'font-lock-set-defaults) t) (make-local-variable 'font-lock-fontified) (make-local-variable 'font-lock-multiline) |