[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100459: Fix to select_window.

[Chong Yidong]

------------------------------------------------------------
revno: 100459
author: Martin Rudalics <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2011-02-08 19:11:15 -0500
message:
  Fix to select_window.
  http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00346.html
  
  * window.c (select_window): Check inhibit_point_swap argument when
  deciding whether to return immediately.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-08 07:19:20 +0000
+++ b/src/ChangeLog     2011-02-09 00:11:15 +0000
@@ -1,3 +1,8 @@
+2011-02-09  Martin Rudalics  <address@hidden>
+
+       * window.c (select_window): Check inhibit_point_swap argument when
+       deciding whether to return immediately.
+
 2011-02-08  Jan Djärv  <address@hidden>
 
        * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become

=== modified file 'src/window.c'
--- a/src/window.c      2011-02-01 19:01:25 +0000
+++ b/src/window.c      2011-02-09 00:11:15 +0000
@@ -3607,7 +3607,7 @@
       XSETFASTINT (w->use_time, window_select_count);
     }
 
-  if (EQ (window, selected_window))
+  if (EQ (window, selected_window) && !inhibit_point_swap)
     return window;
 
   sf = SELECTED_FRAME ();