*** empty log message ***

2 files changed, 29 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 61fa7e4167b..31dea2db9d5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -856,13 +856,20 @@ Instead, the `$ENVVAR' text is left as is, so that `$$' quoting
 is only rarely needed.
 
 ---
-** jit-lock can now be delayed with `jit-lock-defer-time'.
+** JIT-lock changes
+*** jit-lock can now be delayed with `jit-lock-defer-time'.
 
 If this variable is non-nil, its value should be the amount of Emacs
 idle time in seconds to wait before starting fontification.  For
 example, if you set `jit-lock-defer-time' to 0.25, fontification will
 only happen after 0.25s of idle time.
 
+*** contextual refontification is now separate from stealth fontification.
+
+jit-lock-defer-contextually is renamed jit-lock-contextually and
+jit-lock-context-time determines the delay after which contextual
+refontification takes place.
+
 +++
 ** Marking commands extend the region when invoked multiple times.  If
 you hit M-C-SPC (mark-sexp), M-@ (mark-word), M-h (mark-paragraph), or
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3e98e8cd11..f76f875d5e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,15 +1,29 @@
-2004-01-29 Tue  Jari Aalto  <jari.aalto <AT> poboxes.com>
+2004-01-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * progmodes/executable.el (executable-command-find-posix-p):
-        New.  Check if find handles arguments Posix-style.
+        * jit-lock.el (jit-lock-context-time, jit-lock-context-timer): New var.
+        (with-buffer-unmodified, with-buffer-prepared-for-jit-lock):
+        Add edebug info.
+        (jit-lock-mode): Setup/cancel the new timer.
+        (jit-lock-context-fontify): New fun.  Extracted from
+        context fontification code of jit-lock-stealth-fontify.
+        (jit-lock-stealth-fontify): Don't do context fontification any more.
 
-        * progmodes/grep.el (grep-compute-defaults):
+        * jit-lock.el (jit-lock-stealth-fontify): Allow quit.
+        (jit-lock-fontify-now): Handle the `quit' case.
+        (jit-lock-contextually): Rename from jit-lock-defer-contextually.
+
+2004-01-29  Jari Aalto  <jari.aalto@poboxes.com>
+
+        * progmodes/executable.el (executable-command-find-posix-p):
+        New.  Check if find handles arguments Posix-style.
+
+        * progmodes/grep.el (grep-compute-defaults):
         Use executable-command-find-posix-p.
-        (grep-find): Check `grep-find-command'.
+        (grep-find): Check `grep-find-command'.
 
-        * filecache.el (file-cache-find-posix-p): Deleted.
+        * filecache.el (file-cache-find-posix-p): Delete.
         (file-cache-add-directory-using-find):
-        Use `executable-command-find-posix-p' 
+        Use `executable-command-find-posix-p'.
 
 2004-01-29  Dave Love  <fx@gnu.org>