[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 aff8bca: * lisp/replace.el (occur-engine-line): Revert part of
From: |
Juri Linkov |
Subject: |
emacs-27 aff8bca: * lisp/replace.el (occur-engine-line): Revert part of fb16313025 (bug#39597) |
Date: |
Sat, 22 Feb 2020 19:34:52 -0500 (EST) |
branch: emacs-27
commit aff8bca77c0e32b7d7044dae73a2848f91d0e35b
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>
* lisp/replace.el (occur-engine-line): Revert part of fb16313025 (bug#39597)
; Do not merge to master.
---
lisp/replace.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/replace.el b/lisp/replace.el
index a0b0506..491bf33 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 aff8bca: * lisp/replace.el (occur-engine-line): Revert part of fb16313025 (bug#39597),
Juri Linkov <=