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

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        07/03/09 17:41:38

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -b -r1.942 -r1.943
--- xterm.c     4 Mar 2007 18:28:49 -0000       1.942
+++ xterm.c     9 Mar 2007 17:41:38 -0000       1.943
@@ -6759,7 +6759,9 @@
                 int y = event.xbutton.y;
 
                 window = window_from_coordinates (f, x, y, 0, 0, 0, 1);
-                if (EQ (window, f->tool_bar_window))
+                tool_bar_p = EQ (window, f->tool_bar_window);
+
+                if (tool_bar_p && event.xbutton.button < 4)
                   {
                    if (event.xbutton.type == ButtonPress)
                      handle_tool_bar_click (f, x, y, 1, 0);
@@ -6767,7 +6769,6 @@
                      handle_tool_bar_click (f, x, y, 0,
                                             x_x_to_emacs_modifiers (dpyinfo,
                                                                     
event.xbutton.state));
-                   tool_bar_p = 1;
                   }
               }