2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2df187383a4..9fbf1841982 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (select_window): Check inhibit_point_swap argument when
+        deciding whether to return immediately.
+
 2011-02-08  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
diff --git a/src/window.c b/src/window.c
index 12775ffa7d4..3e6062a7153 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3607,7 +3607,7 @@ select_window (window, norecord, inhibit_point_swap)
       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 ();