mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
; Do not merge to master.
This commit is contained in:
Juri Linkov 2020-02-23 02:34:45 +02:00
parent dd5756436c
commit aff8bca77c
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/replace.el
View file

@ -1937,8 +1937,10 @@ See also `multi-occur'."
global-matches))) global-matches)))
(defun occur-engine-line (beg end &optional keep-props) (defun occur-engine-line (beg end &optional keep-props)
(if (and keep-props font-lock-mode) (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode)
(font-lock-ensure beg end)) (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))) (if (and keep-props (not (eq occur-excluded-properties t)))
(let ((str (buffer-substring beg end))) (let ((str (buffer-substring beg end)))
(remove-list-of-text-properties (remove-list-of-text-properties