[Emacs-diffs] /srv/bzr/emacs/trunk r105766: * replace.el (occur-mode-goto-occurrence): Don't force using other window.

[Chong Yidong]

------------------------------------------------------------
revno: 105766
fixes bug(s): http://debbugs.gnu.org/9499
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-09-14 11:14:34 -0400
message:
  * replace.el (occur-mode-goto-occurrence): Don't force using other window.
modified:
  lisp/ChangeLog
  lisp/dired.el
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-14 15:06:28 +0000
+++ b/lisp/ChangeLog    2011-09-14 15:14:34 +0000
@@ -1,5 +1,8 @@
 2011-09-14  Chong Yidong  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2011-09-12 20:45:56 +0000
+++ b/lisp/dired.el     2011-09-14 15:14:34 +0000
@@ -3663,7 +3663,7 @@
 ;;;;;;  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" "\

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2011-09-10 21:15:28 +0000
+++ b/lisp/replace.el   2011-09-14 15:14:34 +0000
@@ -940,7 +940,7 @@
              (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)))