From: Juri Linkov <juri@linkov.net>
Date: Sun, 23 Feb 2020 00:34:45 +0000 (+0200)
Subject: * lisp/replace.el (occur-engine-line): Revert part of fb16313025 (bug#39597)
X-Git-Tag: emacs-27.0.90~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aff8bca77c;p=emacs.git

* lisp/replace.el (occur-engine-line): Revert part of fb16313025 (bug#39597)

; Do not merge to master.
---

diff --git a/lisp/replace.el b/lisp/replace.el
index a0b050637e1..491bf33ea4a 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1937,8 +1937,10 @@ See also `multi-occur'."
       global-matches)))
 
 (defun occur-engine-line (beg end &optional keep-props)
-  (if (and keep-props font-lock-mode)
-      (font-lock-ensure beg end))
+  (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode)
+	   (text-property-not-all beg end 'fontified t))
+      (if (fboundp 'jit-lock-fontify-now)
+	  (jit-lock-fontify-now beg end)))
   (if (and keep-props (not (eq occur-excluded-properties t)))
       (let ((str (buffer-substring beg end)))
 	(remove-list-of-text-properties