Mercurial > emacs

changeset 99407:c04fb0278b64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(handle_one_xevent): Don't let popup menus cause mouse-autoselect-window related window switching. (Bug#1261)
author Glenn Morris <rgm@gnu.org>
date Thu, 06 Nov 2008 03:49:17 +0000
parents 725004027d70
children 23cbe9ede0de
files src/xterm.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;