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

* replace.el (occur-accumulate-lines, occur-engine):

Browse source 
Use `occur-engine-line' instead of duplicate code.
(occur-engine-line): New function created from duplicate code
in `occur-accumulate-lines' and `occur-engine'.
This commit is contained in:
Juri Linkov 2010-03-23 09:16:57 +02:00
parent 75a3ff20ab
commit f14d1172a2
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lisp/replace.el
View file

@ -1016,18 +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))
(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)))
(push
(if (and keep-props (not (eq occur-excluded-properties t)))
(let ((str (buffer-substring beg end)))
(remove-list-of-text-properties
0 (length str) occur-excluded-properties str)
str)
(buffer-substring-no-properties beg end))
result)
(push (occur-engine-line beg end) result)
(forward-line (if forwardp 1 -1)))
(nreverse result))))
@ -1228,17 +1217,7 @@ See also `multi-occur'."
endpt (line-end-position)))
(setq marker (make-marker))
(set-marker marker matchbeg)
(if (and keep-props
(if (boundp 'jit-lock-mode) jit-lock-mode)
(text-property-not-all begpt endpt 'fontified t))
(if (fboundp 'jit-lock-fontify-now)
(jit-lock-fontify-now begpt endpt)))
(if (and keep-props (not (eq occur-excluded-properties t)))
(progn
(setq curstring (buffer-substring begpt endpt))
(remove-list-of-text-properties
0 (length curstring) occur-excluded-properties curstring))
(setq curstring (buffer-substring-no-properties begpt endpt)))
(setq curstring (occur-engine-line begpt endpt))
;; Highlight the matches
(let ((len (length curstring))
(start 0))
@ -1335,6 +1314,18 @@ See also `multi-occur'."
;; Return the number of matches
globalcount)))
(defun occur-engine-line (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
0 (length str) occur-excluded-properties str)
str)
(buffer-substring-no-properties beg end)))
;; Generate context display for occur.
;; OUT-LINE is the line where the match is.
;; NLINES and KEEP-PROPS are args to occur-engine.