[Emacs-diffs] /srv/bzr/emacs/trunk r107444: * font-lock.el (font-lock-specified-p): Rename from font-lock-spec-present.

[Chong Yidong]

------------------------------------------------------------
revno: 107444
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-27 10:34:12 +0800
message:
  * font-lock.el (font-lock-specified-p): Rename from font-lock-spec-present.
  Callers changed.
modified:
  lisp/ChangeLog
  lisp/font-core.el
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-27 01:57:50 +0000
+++ b/lisp/ChangeLog    2012-02-27 02:34:12 +0000
@@ -1,3 +1,8 @@
+2012-02-27  Chong Yidong  <address@hidden>
+
+       * font-lock.el (font-lock-specified-p): Rename from
+       font-lock-spec-present.  Callers changed.
+
 2012-02-27  Daniel Hackney  <address@hidden>  (tiny change)
 
        * emacs-lisp/package.el (package-compute-transaction): Handle

=== modified file 'lisp/font-core.el'
--- a/lisp/font-core.el 2012-02-26 13:02:52 +0000
+++ b/lisp/font-core.el 2012-02-27 02:34:12 +0000
@@ -192,7 +192,7 @@
 
   ;; 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 ()

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2012-02-26 13:02:52 +0000
+++ b/lisp/font-lock.el 2012-02-27 02:34:12 +0000
@@ -629,10 +629,13 @@
   ;; 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 @@
   ;; 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)