summaryrefslogtreecommitdiff
path: root/lisp/font-lock.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-02-27 10:34:12 +0800
committerChong Yidong <cyd@gnu.org>2012-02-27 10:34:12 +0800
commitc98c62764aad6136abc78e7e14cc89f938a17aec (patch)
treeb4c49e335284b3d1eeb0af15cc1d57c1465e0e44 /lisp/font-lock.el
parent8ac9e52930219a1621e59aafcf7b30d97c325702 (diff)
downloademacs-c98c62764aad6136abc78e7e14cc89f938a17aec.tar.gz
* font-lock.el (font-lock-specified-p): Rename from font-lock-spec-present.
Callers changed.
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r--lisp/font-lock.el11
1 files changed, 7 insertions, 4 deletions
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)