aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorMartin Rudalics2011-02-08 19:11:15 -0500
committerChong Yidong2011-02-08 19:11:15 -0500
commitbae1fa42dc24348d6ba303b633a3cf19dec625fa (patch)
tree9c956ce3c9f9180bc47572df8f00f512f60b91f2 /src/window.c
parent9aabf64c78017a55dedab5481ed20776c57f284b (diff)
downloademacs-bae1fa42dc24348d6ba303b633a3cf19dec625fa.tar.gz
emacs-bae1fa42dc24348d6ba303b633a3cf19dec625fa.zip
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.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c2
1 files changed, 1 insertions, 1 deletions
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)
3607 XSETFASTINT (w->use_time, window_select_count); 3607 XSETFASTINT (w->use_time, window_select_count);
3608 } 3608 }
3609 3609
3610 if (EQ (window, selected_window)) 3610 if (EQ (window, selected_window) && !inhibit_point_swap)
3611 return window; 3611 return window;
3612 3612
3613 sf = SELECTED_FRAME (); 3613 sf = SELECTED_FRAME ();