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

[Juri Linkov]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.231 emacs/lisp/replace.el:1.232
*** emacs/lisp/replace.el:1.231 Mon Nov 28 19:18:51 2005
--- emacs/lisp/replace.el       Mon Nov 28 19:59:16 2005
***************
*** 755,761 ****
        (save-excursion
        (goto-char (posn-point (event-end event)))
        (setq pos (occur-mode-find-occurrence))))
!     (switch-to-buffer-other-window (marker-buffer pos))
      (goto-char pos)))
  
  (defun occur-mode-find-occurrence ()
--- 755,763 ----
        (save-excursion
        (goto-char (posn-point (event-end event)))
        (setq pos (occur-mode-find-occurrence))))
!     (let (same-window-buffer-names
!         same-window-regexps)
!       (pop-to-buffer (marker-buffer pos)))
      (goto-char pos)))
  
  (defun occur-mode-find-occurrence ()
***************
*** 769,775 ****
  (defun occur-mode-goto-occurrence ()
    "Go to the occurrence the current line describes."
    (interactive)
!   (let ((pos (occur-mode-find-occurrence)))
      (pop-to-buffer (marker-buffer pos))
      (goto-char pos)))
  
--- 771,779 ----
  (defun occur-mode-goto-occurrence ()
    "Go to the occurrence the current line describes."
    (interactive)
!   (let ((pos (occur-mode-find-occurrence))
!       same-window-buffer-names
!       same-window-regexps)
      (pop-to-buffer (marker-buffer pos))
      (goto-char pos)))
  
***************
*** 832,838 ****
  
      (goto-char (cond (reset (point-min))
                     ((< argp 0) (line-beginning-position))
!                    ((line-end-position))))
      (occur-find-match
       (abs argp)
       (if (> 0 argp)
--- 836,843 ----
  
      (goto-char (cond (reset (point-min))
                     ((< argp 0) (line-beginning-position))
!                    ((> argp 0) (line-end-position))
!                    ((point))))
      (occur-find-match
       (abs argp)
       (if (> 0 argp)