From: Martin Rudalics <rudalics@gmx.at>
Date: Wed, 9 Feb 2011 00:11:15 +0000 (-0500)
Subject: Fix to select_window.
X-Git-Tag: emacs-pretest-23.2.94~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bae1fa42dc24348d6ba303b633a3cf19dec625fa;p=emacs.git

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.
---

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 ();