From 53e87c57beb29757236032939c9333cb2e56d024 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 23 Mar 2010 17:48:09 +0200 Subject: [PATCH] * replace.el (occur-engine-line): Add optional arg `keep-props'. (occur-accumulate-lines, occur-engine): Add arg `keep-props'. --- lisp/ChangeLog | 3 +++ lisp/replace.el | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77bd0fa1826..b84b8436993 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,9 @@ (occur-engine-line): New function created from duplicate code in `occur-accumulate-lines' and `occur-engine'. + * replace.el (occur-engine-line): Add optional arg `keep-props'. + (occur-accumulate-lines, occur-engine): Add arg `keep-props'. + 2010-03-23 Juri Linkov * finder.el: Remove TODO tasks. diff --git a/lisp/replace.el b/lisp/replace.el index 613cced8ea5..f2d49b4de1c 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1016,7 +1016,7 @@ which means to discard all text properties." (setq count (+ count (if forwardp -1 1))) (setq beg (line-beginning-position) end (line-end-position)) - (push (occur-engine-line beg end) result) + (push (occur-engine-line beg end keep-props) result) (forward-line (if forwardp 1 -1))) (nreverse result)))) @@ -1217,7 +1217,7 @@ See also `multi-occur'." endpt (line-end-position))) (setq marker (make-marker)) (set-marker marker matchbeg) - (setq curstring (occur-engine-line begpt endpt)) + (setq curstring (occur-engine-line begpt endpt keep-props)) ;; Highlight the matches (let ((len (length curstring)) (start 0)) @@ -1314,7 +1314,7 @@ See also `multi-occur'." ;; Return the number of matches globalcount))) -(defun occur-engine-line (beg end) +(defun occur-engine-line (beg end &optional keep-props) (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) -- 2.39.2