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

[Colin Walters]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.134 emacs/lisp/replace.el:1.135
*** emacs/lisp/replace.el:1.134 Thu Apr 25 15:02:46 2002
--- emacs/lisp/replace.el       Thu Apr 25 17:12:09 2002
***************
*** 779,785 ****
                                 curstring
                                 "\n"))
                               (data
!                               (if (= nlines 1)
                                    ;; The simple display style
                                    out-line
                                 ;; The complex multi-line display
--- 779,785 ----
                                 curstring
                                 "\n"))
                               (data
!                               (if (= nlines 0)
                                    ;; The simple display style
                                    out-line
                                 ;; The complex multi-line display
***************
*** 787,800 ****
                                 ;; 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))
                                  (end (insert-get-point data)))
!                             (unless (= nlines 1)
                                (insert-get-point "-------\n"))
                              (add-text-properties
                               beg (1- end)
--- 787,800 ----
                                 ;; concatenate them all together.
                                 (apply #'concat
                                        (nconc
!                                        (add-prefix (nreverse (cdr 
(occur-accumulate-lines (- (1+ nlines)) t))))
                                         (list out-line)
!                                        (add-prefix (cdr 
(occur-accumulate-lines (1+ nlines) t))))))))
                          ;; Actually insert the match display data
                          (with-current-buffer out-buf
                            (let ((beg (point))
                                  (end (insert-get-point data)))
!                             (unless (= nlines 0)
                                (insert-get-point "-------\n"))
                              (add-text-properties
                               beg (1- end)