[Emacs-diffs] Changes to emacs/lisp/replace.el

[Colin Walters]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.132 emacs/lisp/replace.el:1.133
*** emacs/lisp/replace.el:1.132 Tue Apr 23 16:34:58 2002
--- emacs/lisp/replace.el       Wed Apr 24 19:28:45 2002
***************
*** 579,585 ****
    :type 'face
    :group 'matching)
  
! (defun occur-accumulate-lines (count)
    (save-excursion
      (let ((forwardp (> count 0))
          (result nil))
--- 579,585 ----
    :type 'face
    :group 'matching)
  
! (defun occur-accumulate-lines (count &optional no-props)
    (save-excursion
      (let ((forwardp (> count 0))
          (result nil))
***************
*** 591,597 ****
            (decf count)
          (incf count))
        (push
!        (buffer-substring
          (line-beginning-position)
          (line-end-position))
         result)
--- 591,599 ----
            (decf count)
          (incf count))
        (push
!        (funcall (if no-props
!                     #'buffer-substring-no-properties
!                   #'buffer-substring)
          (line-beginning-position)
          (line-end-position))
         result)
***************
*** 786,794 ****
                                 ;; concatenate them all together.
                                 (apply #'concat
                                        (nconc
!                                        (add-prefix (nreverse (cdr 
(occur-accumulate-lines (- nlines)))))
                                         (list out-line)
!                                        (add-prefix (cdr 
(occur-accumulate-lines nlines))))))))
                          ;; Actually insert the match display data
                          (with-current-buffer out-buf
                            (let ((beg (point))
--- 788,796 ----
                                 ;; concatenate them all together.
                                 (apply #'concat
                                        (nconc
!                                        (add-prefix (nreverse (cdr 
(occur-accumulate-lines (- nlines) t))))
                                         (list out-line)
!                                        (add-prefix (cdr 
(occur-accumulate-lines nlines t))))))))
                          ;; Actually insert the match display data
                          (with-current-buffer out-buf
                            (let ((beg (point))