# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1225943357 0
# Node ID c04fb0278b64bec33d8981b6fc57ea8bd5e86bb4
# Parent  725004027d70c899f39d587f6f962dfd43562367
(handle_one_xevent): Don't let popup menus cause
mouse-autoselect-window related window switching.  (Bug#1261)

diff -r 725004027d70 -r c04fb0278b64 src/xterm.c
--- a/src/xterm.c	Thu Nov 06 03:47:50 2008 +0000
+++ b/src/xterm.c	Thu Nov 06 03:49:17 2008 +0000
@@ -6722,8 +6722,9 @@
         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;