* replace.el (occur-mode-goto-occurrence): Don't force using other window.

Fixes: debbugs:9499

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b447c11b1058e1ddfe0d9f3c04559b31783045c..1ea29f1e65d3d4c3de8da3e001fe0ac9d8b00a1c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-14  Chong Yidong  <cyd@stupidchicken.com>
 
+       * replace.el (occur-mode-goto-occurrence): Don't force using other
+       window (Bug#9499).
+
        * dired-aux.el (dired-do-chmod): Don't provide initial input.
 
 2011-09-14  Martin Rudalics  <rudalics@gmx.at>

diff --git a/lisp/dired.el b/lisp/dired.el
index 3428f5bef8b9b6ab071b3d137dfacd327c2e9ac2..f01e195f9ecaa3f3802be2bb6c5c57f783ef2e31 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3663,7 +3663,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "bbc9babe193843cad535d73492326c48")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "0ffe89ae728efb341dfacff6c85e2ba4")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\

diff --git a/lisp/replace.el b/lisp/replace.el
index ee430fd9855c4174985a91948fc51424228b62b2..70175cf205c41c7e0b277adbeeb1692860009fd4 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -940,7 +940,7 @@ To return to ordinary Occur mode, use \\[occur-mode]."
              (save-excursion
                (goto-char (posn-point (event-end event)))
                (occur-mode-find-occurrence))))))
-    (pop-to-buffer (marker-buffer pos) t)
+    (pop-to-buffer (marker-buffer pos))
     (goto-char pos)
     (run-hooks 'occur-mode-find-occurrence-hook)))