Mercurial > emacs

diff src/xterm.c @ 83653:2a69b973fae2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 852-856) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 93-96) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 245) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32
author Miles Bader <miles@gnu.org>
date Tue, 21 Aug 2007 04:55:30 +0000
parents 5b644ae74c91 15f0ab37e515
children 04182505543b
line wrap: on
line diff
--- a/src/xterm.c	Mon Aug 13 13:51:08 2007 +0000
+++ b/src/xterm.c	Tue Aug 21 04:55:30 2007 +0000
@@ -6866,27 +6866,23 @@
               }
 
             if (!tool_bar_p)
-              if (!dpyinfo->x_focus_frame
-                  || f == dpyinfo->x_focus_frame)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+              if (! popup_activated ())
+#endif
                 {
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-                  if (! popup_activated ())
-#endif
-		    {
-		      if (ignore_next_mouse_click_timeout)
-			{
-			  if (event.type == ButtonPress
-			      && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
-			    {
-			      ignore_next_mouse_click_timeout = 0;
-			      construct_mouse_click (&inev.ie, &event.xbutton, f);
-			    }
-			  if (event.type == ButtonRelease)
-			    ignore_next_mouse_click_timeout = 0;
-			}
-		      else
-			construct_mouse_click (&inev.ie, &event.xbutton, f);
-		    }
+                  if (ignore_next_mouse_click_timeout)
+                    {
+                      if (event.type == ButtonPress
+                          && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
+                        {
+                          ignore_next_mouse_click_timeout = 0;
+                          construct_mouse_click (&inev.ie, &event.xbutton, f);
+                        }
+                      if (event.type == ButtonRelease)
+                        ignore_next_mouse_click_timeout = 0;
+                    }
+                  else
+                    construct_mouse_click (&inev.ie, &event.xbutton, f);
                 }
           }
         else