(jit-lock-fontify-now): Don't fontify the empty text.

(jit-lock-fontify-again): Don't refontify text that's not displayed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8388c7af0badd05e3faa14ff780e4c6405173cd9..d7c78cae799c9cf353f50dc5713305b21674a949 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * jit-lock.el (jit-lock-fontify-now): Don't fontify the empty text.
+       (jit-lock-fontify-again): Don't refontify text that's not displayed.
+
 2006-09-26  Kenichi Handa  <handa@m17n.org>
 
        * startup.el (display-splash-screen): Allow a prefix argument.

diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 4cbc7da4511ab5268d0b91ff586740b56873e7b6..612641d095485962f2ba271fe197e8cdd684a0a7 100644 (file)
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -349,7 +349,7 @@ Defaults to the whole buffer.  END can be out of bounds."
         ;; Fontify chunks beginning at START.  The end of a
         ;; chunk is either `end', or the start of a region
         ;; before `end' that has already been fontified.
-        (while start
+        (while (and start (< start end))
           ;; Determine the end of this chunk.
           (setq next (or (text-property-any start end 'fontified t)
                          end))
@@ -405,9 +405,11 @@ Defaults to the whole buffer.  END can be out of bounds."
 
 (defun jit-lock-fontify-again (buf start end)
   "Fontify in buffer BUF from START to END."
-  (with-current-buffer buf
-    (with-buffer-prepared-for-jit-lock
-     (put-text-property start end 'fontified t))))
+  ;; Don't bother refontifying text that's not even displayed.
+  (when (setq start (text-property-not-all start end 'fontified nil buf))
+    (with-current-buffer buf
+      (with-buffer-prepared-for-jit-lock
+       (put-text-property start end 'fontified nil)))))
 
 
 \f