Mercurial > emacs
diff src/xterm.c @ 90787:91bf6e05918b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 662-669)
- Update from CVS
- Fix read-only prompt problem in isearch
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 207-208)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 18 Mar 2007 14:11:08 +0000 |
| parents | dd7c098af727 e95c60f2a27e |
| children | 31beec9ee600 |
line wrap: on
line diff
--- a/src/xterm.c Sun Mar 18 14:00:43 2007 +0000 +++ b/src/xterm.c Sun Mar 18 14:11:08 2007 +0000 @@ -5525,7 +5525,7 @@ 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); @@ -6979,15 +6979,16 @@ 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; } }