Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-660
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-661
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-662
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-663
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-664
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-665
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-666
   Fix read-only prompt problem in isearch

 * emacs@sv.gnu.org/emacs--devo--0--patch-667
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-668
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-669
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-670
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-671
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-672
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-673
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-206
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-207
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-208
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600

1 files changed, 9 insertions, 8 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 5fb04d8103e..6a574533a2c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5292,7 +5292,7 @@ x_scroll_bar_expose (bar, event)
 
   x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
 
-   /* Switch to scroll bar foreground color. */
+  /* Switch to scroll bar foreground color.  */
   if (f->output_data.x->scroll_bar_foreground_pixel != -1)
     XSetForeground (FRAME_X_DISPLAY (f), gc,
                     f->output_data.x->scroll_bar_foreground_pixel);
@@ -6772,15 +6772,16 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                 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);
-                    else
-                      handle_tool_bar_click (f, x, y, 0,
-                                             x_x_to_emacs_modifiers (dpyinfo,
+                    if (event.xbutton.type == ButtonPress)
+                      handle_tool_bar_click (f, x, y, 1, 0);
+                    else
+                      handle_tool_bar_click (f, x, y, 0,
+                                             x_x_to_emacs_modifiers (dpyinfo,
                                                                      event.xbutton.state));
-                    tool_bar_p = 1;
                   }
               }