[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/replace.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/replace.el [emacs-unicode-2] |
Date: |
Wed, 28 Jul 2004 03:09:29 -0400 |
Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.165.4.6 emacs/lisp/replace.el:1.165.4.7
*** emacs/lisp/replace.el:1.165.4.6 Fri Jul 23 04:30:38 2004
--- emacs/lisp/replace.el Wed Jul 28 07:05:50 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))