(font-lock-after-fontify-buffer)

(font-lock-after-unfontify-buffer): No need to call back to jit-lock.

2 files changed, 20 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b62884e10ab..80afd633151 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2000-06-17  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * font-lock.el (font-lock-after-fontify-buffer)
+        (font-lock-after-unfontify-buffer): No need to call back to jit-lock.
+
+        * jit-lock.el (jit-lock-mode): Force jit-refontify when turned on.
+        Use consistent make-local-variable style for font-lock-fontified.
+        (jit-lock-fontify-buffer):
+        Don't bother checking for font-lock-mode and jit-lock-mode.
+
         * time.el: Remove trailing ^M that prevent CVS-merging.
 
 2000-06-16  Stefan Monnier  <monnier@cs.yale.edu>
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index bb2aad830df..9bf9f8e0810 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1098,16 +1098,23 @@ The value of this variable is used when Font Lock mode is turned on."
 (defun font-lock-after-fontify-buffer ()
   (cond (fast-lock-mode
          (fast-lock-after-fontify-buffer))
-        (jit-lock-mode
-         (jit-lock-after-fontify-buffer))
+        ;; Useless now that jit-lock intercepts font-lock-fontify-buffer.  -sm
+        ;; (jit-lock-mode
+        ;;  (jit-lock-after-fontify-buffer))
         (lazy-lock-mode
          (lazy-lock-after-fontify-buffer))))
 
 (defun font-lock-after-unfontify-buffer ()
   (cond (fast-lock-mode
          (fast-lock-after-unfontify-buffer))
-        (jit-lock-mode
-         (jit-lock-after-unfontify-buffer))
+        ;; Useless as well.  It's only called when:
+        ;; - turning off font-lock: it does not matter if we leave spurious
+        ;;   `fontified' text props around since jit-lock-mode is also off.
+        ;; - font-lock-default-fontify-buffer fails: this is not run
+        ;;   any more anyway.   -sm
+        ;; 
+        ;; (jit-lock-mode
+        ;;  (jit-lock-after-unfontify-buffer))
         (lazy-lock-mode
          (lazy-lock-after-unfontify-buffer))))
 
@@ -3163,6 +3170,7 @@ See also `java-font-lock-extra-types'.")
 
 ;; Install ourselves:
 
+;; Useful for the popup-menu for mouse-3 on the modeline.
 (unless (assq 'font-lock-mode minor-mode-alist)
   (push '(font-lock-mode nil) minor-mode-alist))