From a1dd29361ac672769fd65b1648457d77200607e5 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 6 Nov 2008 03:49:28 +0000 Subject: [PATCH] (handle_one_xevent): Don't let popup menus cause mouse-autoselect-window related window switching. (Bug#1261) --- src/ChangeLog | 5 +++++ src/xterm.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3fcbd4aaf98..2d94ce8a9af 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-11-06 Glenn Morris + + * xterm.c (handle_one_xevent): Don't let popup menus cause + mouse-autoselect-window related window switching. (Bug#1261) + 2008-11-04 David Smith (tiny change) * xterm.c (xim_close_dpy): Avoid double-free on X11R6 XIM. diff --git a/src/xterm.c b/src/xterm.c index 788bc39e2d6..eef22a51443 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6722,8 +6722,9 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) if (f) { - /* Generate SELECT_WINDOW_EVENTs when needed. */ - if (!NILP (Vmouse_autoselect_window)) + /* Generate SELECT_WINDOW_EVENTs when needed. + Don't let popup menus influence things (bug#1261). */ + if (!NILP (Vmouse_autoselect_window) && !popup_activated ()) { Lisp_Object window; -- 2.39.2