[Emacs-diffs] /srv/bzr/emacs/trunk r105589: Fix bug in display-buffer-reuse-window (Bug#9381).

[martin rudalics]

------------------------------------------------------------
revno: 105589
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-27 10:38:33 +0200
message:
  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)
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-27 08:28:46 +0000
+++ b/lisp/ChangeLog    2011-08-27 08:38:33 +0000
@@ -1,3 +1,9 @@
+2011-08-27  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/rcirc.el (rcirc-check-auth-status): Adding support for

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-08-25 00:45:23 +0000
+++ b/lisp/window.el    2011-08-27 08:38:33 +0000
@@ -4761,7 +4761,9 @@
                   (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)))