diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/replace.el | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 576ddaef86..8deeadac3a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2002-04-24 Colin Walters <[email protected]> + * 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. diff --git a/lisp/replace.el b/lisp/replace.el index ad197fff56..d34916b0b2 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -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)) |