(handle_one_xevent): Don't let popup menus cause

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

src/ChangeLog

+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.

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;