[Emacs-diffs] Changes to emacs/lisp/window.el,v

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       08/09/13 08:28:47

Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- window.el   11 Sep 2008 06:35:55 -0000      1.152
+++ window.el   13 Sep 2008 08:28:47 -0000      1.153
@@ -1053,14 +1053,13 @@
     (set-buffer buffer)
     (setq new-window (display-buffer buffer other-window) norecord)
     (unless (eq new-window old-window)
-      ;; `display-buffer' has chosen another window.
+      ;; `display-buffer' has chosen another window, select it.
+      (select-window new-window)
       (setq new-frame (window-frame new-window))
       (unless (eq new-frame old-frame)
        ;; `display-buffer' has chosen another frame, make sure it gets
        ;; input focus and is risen.
-       (select-frame-set-input-focus new-frame))
-      ;; Make sure the window chosen by `display-buffer' gets selected.
-      (select-window new-window))
+       (select-frame-set-input-focus new-frame)))
     buffer))
 
 ;; I think this should be the default; I think people will prefer it--rms.