[Emacs-diffs] /srv/bzr/emacs/trunk r105879: * window.el (pop-to-buffer): Ensure right window is selected if we chose another frame.

[Chong Yidong]

------------------------------------------------------------
revno: 105879
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-22 21:42:40 -0400
message:
  * window.el (pop-to-buffer): Ensure right window is selected if we chose 
another frame.
  Otherwise, C-x 5 b might not select the right window if reusing a
  window on another frame.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-22 16:49:57 +0000
+++ b/lisp/ChangeLog    2011-09-23 01:42:40 +0000
@@ -1,3 +1,8 @@
+2011-09-23  Chong Yidong  <address@hidden>
+
+       * window.el (pop-to-buffer): Ensure right window is selected if we
+       chose another frame.
+
 2011-09-22  Eli Zaretskii  <address@hidden>
 
        * simple.el (what-cursor-position): Use get-char-property-change

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-22 16:15:52 +0000
+++ b/lisp/window.el    2011-09-23 01:42:40 +0000
@@ -4853,12 +4853,11 @@
         (old-frame (selected-frame))
         (window (display-buffer buffer action))
         (frame (window-frame window)))
-    (if (eq frame old-frame)
-       ;; Make sure new window is selected (Bug#8615), (Bug#6954).
-       (select-window window norecord)
-      ;; If `display-buffer' has chosen another frame, make sure it
-      ;; gets input focus.
+    ;; If we chose another frame, make sure it gets input focus.
+    (unless (eq frame old-frame)
       (select-frame-set-input-focus frame norecord))
+    ;; Make sure new window is selected (Bug#8615), (Bug#6954).
+    (select-window window norecord)
     buffer))
 
 (defun pop-to-buffer-same-window (buffer &optional norecord)