diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-02-27 10:34:12 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-02-27 10:34:12 +0800 |
| commit | c98c62764aad6136abc78e7e14cc89f938a17aec (patch) | |
| tree | b4c49e335284b3d1eeb0af15cc1d57c1465e0e44 | |
| parent | 8ac9e52930219a1621e59aafcf7b30d97c325702 (diff) | |
| download | emacs-c98c62764aad6136abc78e7e14cc89f938a17aec.tar.gz | |
* font-lock.el (font-lock-specified-p): Rename from font-lock-spec-present.
Callers changed.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/font-core.el | 2 | ||||
| -rw-r--r-- | lisp/font-lock.el | 11 |
3 files changed, 13 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57ae84c0fff..c97aa54ca0b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-27 Chong Yidong <cyd@gnu.org> + + * font-lock.el (font-lock-specified-p): Rename from + font-lock-spec-present. Callers changed. + 2012-02-27 Daniel Hackney <dan@haxney.org> (tiny change) * emacs-lisp/package.el (package-compute-transaction): Handle diff --git a/lisp/font-core.el b/lisp/font-core.el index 4a88d973913..fc647a3727b 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -192,7 +192,7 @@ this function onto `change-major-mode-hook'." ;; Only do hard work if the mode has specified stuff in ;; `font-lock-defaults'. - (when (font-lock-spec-present mode) + (when (font-lock-specified-p mode) (font-lock-mode-internal mode))) (defun turn-on-font-lock () diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 7750b30f096..1a7022da012 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -629,10 +629,13 @@ Major/minor modes can set this variable if they know which option applies.") ;; Shut up the byte compiler. (defvar font-lock-face-attributes)) ; Obsolete but respected if set. -(defun font-lock-spec-present (mode) - ;; Is there enough specification to do fontification at all? +(defun font-lock-specified-p (mode) + "Return non-nil if the current buffer is ready for fontification. +The MODE argument, if non-nil, means Font Lock mode is about to +be enabled." (or font-lock-defaults - (if (boundp 'font-lock-keywords) font-lock-keywords) + (and (boundp 'font-lock-keywords) + font-lock-keywords) (and mode (boundp 'font-lock-set-defaults) font-lock-set-defaults @@ -643,7 +646,7 @@ Major/minor modes can set this variable if they know which option applies.") ;; The first fontification after turning the mode on. This must ;; only be called after the mode hooks have been run. (when (and font-lock-mode - (font-lock-spec-present t)) + (font-lock-specified-p t)) (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size))) (cond (font-lock-fontified nil) |