# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1075423255 0
# Node ID 970795582ae9f3c04292ec3340bdbcc2baf37386
# Parent  bbadbe04fc3d845a9d7234027678216b29219411
*** empty log message ***

diff -r bbadbe04fc3d -r 970795582ae9 etc/NEWS
--- a/etc/NEWS	Fri Jan 30 00:20:46 2004 +0000
+++ b/etc/NEWS	Fri Jan 30 00:40:55 2004 +0000
@@ -856,13 +856,20 @@
 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 -r bbadbe04fc3d -r 970795582ae9 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 30 00:20:46 2004 +0000
+++ b/lisp/ChangeLog	Fri Jan 30 00:40:55 2004 +0000
@@ -1,15 +1,29 @@
-2004-01-29 Tue  Jari Aalto  <jari.aalto <AT> poboxes.com>
-
-        * progmodes/executable.el (executable-command-find-posix-p):
-        New.  Check if find handles arguments Posix-style.
-
-        * progmodes/grep.el (grep-compute-defaults):
+2004-01-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* 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.
+
+	* 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'.
-
-	* filecache.el (file-cache-find-posix-p): Deleted.
+	(grep-find): Check `grep-find-command'.
+
+	* 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>