(occur-accumulate-lines): Add optional argument `no-props'. Handle it.

(occur-engine): Use it.
This commit is contained in:
Colin Walters 2002-04-24 23:28:53 +00:00
parent 7664936123
commit 9e2b2e3071
2 changed files with 10 additions and 4 deletions

View file

@ -1,5 +1,9 @@
2002-04-24 Colin Walters <walters@verbum.org>
* replace.el (occur-accumulate-lines): Add optional argument
`no-props'. Handle it.
(occur-engine): Use it.
* ibuf-ext.el (toplevel): Remove byte-compile-dynamic. Try to set
up autoloads manually.
(ibuffer-split-list): New function.

View file

@ -579,7 +579,7 @@ If the value is nil, don't highlight the buffer names specially."
:type 'face
:group 'matching)
(defun occur-accumulate-lines (count)
(defun occur-accumulate-lines (count &optional no-props)
(save-excursion
(let ((forwardp (> count 0))
(result nil))
@ -591,7 +591,9 @@ If the value is nil, don't highlight the buffer names specially."
(decf count)
(incf count))
(push
(buffer-substring
(funcall (if no-props
#'buffer-substring-no-properties
#'buffer-substring)
(line-beginning-position)
(line-end-position))
result)
@ -786,9 +788,9 @@ See also `multi-occur'."
;; concatenate them all together.
(apply #'concat
(nconc
(add-prefix (nreverse (cdr (occur-accumulate-lines (- nlines)))))
(add-prefix (nreverse (cdr (occur-accumulate-lines (- nlines) t))))
(list out-line)
(add-prefix (cdr (occur-accumulate-lines nlines))))))))
(add-prefix (cdr (occur-accumulate-lines nlines t))))))))
;; Actually insert the match display data
(with-current-buffer out-buf
(let ((beg (point))