[Emacs-diffs] Changes to emacs/src/xterm.c,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/11/06 03:49:18

Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -b -r1.1010 -r1.1011
--- xterm.c     4 Nov 2008 16:47:34 -0000       1.1010
+++ xterm.c     6 Nov 2008 03:49:17 -0000       1.1011
@@ -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;