Fix bug in display-buffer-reuse-window (Bug#9381).

* window.el (display-buffer-reuse-window): Fix case where
selected window was reused with non-nil OTHER-WINDOW argument.
(Bug#9381)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5f19a5d1f4abef853771a78ca85722b38338fe5..93f7bd1a20052d9b1fd5af00d114d32c603bfa3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-27  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (display-buffer-reuse-window): Fix case where
+       selected window was reused with non-nil OTHER-WINDOW argument.
+       (Bug#9381)
+
 2011-08-27  Deniz Dogan  <deniz@dogan.se>
 
        * net/rcirc.el (rcirc-check-auth-status): Adding support for

diff --git a/lisp/window.el b/lisp/window.el
index e68af18ab8e9ae324b55ad2a643670ce48488319..651e78bb419fb4572121a8043730964e0774dfe0 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4761,7 +4761,9 @@ BUFFER, nil if none was found."
                   (or (memq (window-parameter window 'window-side)
                             '(nil none))
                       (eq window-buffer buffer))
-                  (or (not method-window)
+                  (or (and (not method-window)
+                           (or (not other-window)
+                               (not (eq window (selected-window)))))
                       (and (eq method-window 'same)
                            (not other-window)
                            (eq window (selected-window)))