Commit bae1fa42 authored by Martin Rudalics's avatar Martin Rudalics Committed by Chong Yidong
Browse files

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.
parent 9aabf64c
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> 2011-02-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
......
...@@ -3607,7 +3607,7 @@ select_window (window, norecord, inhibit_point_swap) ...@@ -3607,7 +3607,7 @@ select_window (window, norecord, inhibit_point_swap)
XSETFASTINT (w->use_time, window_select_count); XSETFASTINT (w->use_time, window_select_count);
} }
if (EQ (window, selected_window)) if (EQ (window, selected_window) && !inhibit_point_swap)
return window; return window;
sf = SELECTED_FRAME (); sf = SELECTED_FRAME ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment