diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-02-08 19:11:15 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-02-08 19:11:15 -0500 |
| commit | 10d90a3adfc1f8aef32f71a35e0221440371dbd6 (patch) | |
| tree | e9c8eca6705221896ee92c0be648732a0cded5b2 | |
| parent | 04f29be9f959fc60f58b51681dd4b19d207a3ae5 (diff) | |
| download | emacs-10d90a3adfc1f8aef32f71a35e0221440371dbd6.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2dda0a53b94..226bac0d0ab 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 (); |