diff options
author | Juri Linkov <juri@linkov.net> | 2020-02-23 02:34:45 +0200 |
---|---|---|
committer | Juri Linkov <juri@linkov.net> | 2020-02-23 02:34:45 +0200 |
commit | aff8bca77c0e32b7d7044dae73a2848f91d0e35b (patch) | |
tree | e40bc0874857e73088d394529a4b7aec40d6bf65 | |
parent | dd5756436c580cc0d00ee875d6645861daf5a867 (diff) | |
download | emacs-aff8bca77c0e32b7d7044dae73a2848f91d0e35b.tar.gz |
* lisp/replace.el (occur-engine-line): Revert part of fb16313025 (bug#39597)
; Do not merge to master.
-rw-r--r-- | lisp/replace.el | 6 |
1 files changed, 4 insertions, 2 deletions
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 |