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

1 files changed, 15 insertions, 19 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1ced63932e5..0e56b04c1b0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6866,27 +6866,23 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
               }
 
             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 ())
+              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