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

[Miles Bader]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.148.2.13 emacs/lisp/replace.el:1.148.2.14
*** emacs/lisp/replace.el:1.148.2.13    Fri Jul 23 04:42:20 2004
--- emacs/lisp/replace.el       Sat Sep  4 09:18:38 2004
***************
*** 732,737 ****
--- 732,739 ----
         #'previous-single-property-change
       #'next-single-property-change)
     "No more matches")
+   ;; In case the *Occur* buffer is visible in a nonselected window.
+   (set-window-point (get-buffer-window (current-buffer)) (point))
    (occur-mode-goto-occurrence))
  
  
***************
*** 1009,1017 ****
                              ;; concatenate them all together.
                              (apply #'concat
                                     (nconc
!                                     (occur-engine-add-prefix (nreverse (cdr 
(occur-accumulate-lines (- (1+ nlines)) keep-props))))
                                      (list out-line)
!                                     (occur-engine-add-prefix (cdr 
(occur-accumulate-lines (1+ nlines) keep-props))))))))
                      ;; Actually insert the match display data
                      (with-current-buffer out-buf
                        (let ((beg (point))
--- 1011,1021 ----
                              ;; concatenate them all together.
                              (apply #'concat
                                     (nconc
!                                     (occur-engine-add-prefix (nreverse (cdr 
(occur-accumulate-lines (- (1+ (abs nlines))) keep-props))))
                                      (list out-line)
!                                     (if (> nlines 0)
!                                         (occur-engine-add-prefix
!                                          (cdr (occur-accumulate-lines (1+ 
nlines) keep-props)))))))))
                      ;; Actually insert the match display data
                      (with-current-buffer out-buf
                        (let ((beg (point))