Commit 53e87c57 authored by Juri Linkov's avatar Juri Linkov
Browse files

* replace.el (occur-engine-line): Add optional arg `keep-props'.

(occur-accumulate-lines, occur-engine): Add arg `keep-props'.
parent ec7995fa
......@@ -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 <juri@jurta.org>
* finder.el: Remove TODO tasks.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment