From bae1fa42dc24348d6ba303b633a3cf19dec625fa Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 8 Feb 2011 19:11:15 -0500 Subject: [PATCH] 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. --- src/ChangeLog | 5 +++++ src/window.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * window.c (select_window): Check inhibit_point_swap argument when + deciding whether to return immediately. + 2011-02-08 Jan Djärv * 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 (); -- 2.39.5