From: Juri Linkov <juri@jurta.org>
Date: Fri, 17 Dec 2004 16:58:54 +0000 (+0000)
Subject: (occur-accumulate-lines, occur-engine):
X-Git-Tag: ttn-vms-21-2-B4~3209
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c13e47b067f1a59d485c74c2b7b18d52ea29bc6;p=emacs.git

(occur-accumulate-lines, occur-engine):
Make forcing deferred font-lock fontification jit-specific.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e973b48e814..48efe0b4f25 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-17  Juri Linkov  <juri@jurta.org>
+
+	* replace.el (occur-accumulate-lines, occur-engine):
+	Make forcing deferred font-lock fontification jit-specific.
+
 2004-12-17  Kim F. Storm  <storm@cua.dk>
 
 	* mouse.el (mouse-1-click-follows-link): New defcustom.
diff --git a/lisp/replace.el b/lisp/replace.el
index 8f81a53bf7e..775ad0ffb05 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -799,9 +799,9 @@ If the value is nil, don't highlight the buffer names specially."
 	(setq count (+ count (if forwardp -1 1)))
 	(setq beg (line-beginning-position)
 	      end (line-end-position))
-	(if (and keep-props font-lock-mode
+	(if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode
 		 (text-property-not-all beg end 'fontified t))
-	    (font-lock-fontify-region beg end))
+	    (jit-lock-fontify-now beg end))
 	(push
 	 (funcall (if keep-props
 		      #'buffer-substring
@@ -1008,9 +1008,9 @@ See also `multi-occur'."
 			    endpt (line-end-position)))
 		    (setq marker (make-marker))
 		    (set-marker marker matchbeg)
-		    (if (and keep-props font-lock-mode
+		    (if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode
 			     (text-property-not-all begpt endpt 'fontified t))
-			(font-lock-fontify-region begpt endpt))
+			(jit-lock-fontify-now begpt endpt))
 		    (setq curstring (buffer-substring begpt endpt))
 		    ;; Depropertize the string, and maybe
 		    ;; highlight the matches