(handle_one_xevent): Don't let popup menus cause

mouse-autoselect-window related window switching.  (Bug#1261)

diff --git a/src/ChangeLog b/src/ChangeLog
index 3fcbd4aaf98f7454bc2a2bdbca2c245795c305f1..2d94ce8a9af335c475c471b3d06adc10a98fdef5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-06  Glenn Morris  <rgm@gnu.org>
+
+       * xterm.c (handle_one_xevent): Don't let popup menus cause
+       mouse-autoselect-window related window switching.  (Bug#1261)
+
 2008-11-04  David Smith  <davidsmith@acm.org>  (tiny change)
 
        * xterm.c (xim_close_dpy): Avoid double-free on X11R6 XIM.

diff --git a/src/xterm.c b/src/xterm.c
index 788bc39e2d6dbdd59f68f259055007d96853e602..eef22a51443dd09986a797b8037e82ce1ca0a8f6 100644 (file)
--- 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;