* 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 a0b050637e1e44bf0af2a1b88344a8b089f4b3b5..491bf33ea4a7d55181971c516146d94c0cb9e67a 100644 (file)
--- 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