diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-10 08:55:03 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-10 08:55:03 +0400 |
| commit | bfd559357dd906f4fe57b67346cf2bd8bdb8f2a3 (patch) | |
| tree | 9eb702d4208c1b32de82269bf061b5d720cadb8f /src/w32term.c | |
| parent | 24ce6a0214e7b885363990e07dabf2935a8c1e11 (diff) | |
| download | emacs-bfd559357dd906f4fe57b67346cf2bd8bdb8f2a3.tar.gz | |
* dispextern.h (last_tool_bar_item): Remove declaration.
* frame.h (struct frame): New member last_tool_bar_item.
* frame.c (make_frame): Initialize it.
* xdisp.c (toplevel): Remove last_tool_bar_item.
(handle_tool_bar_click, note_tool_bar_highlight):
* w32term.c (w32_read_socket, w32_initialize):
* xterm.c (handle_one_xevent, x_initialize): Adjust users.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/w32term.c b/src/w32term.c index fc45bdd30a3..553764a8de5 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -4536,10 +4536,11 @@ w32_read_socket (struct terminal *terminal, Emacs events should reflect only motion after the ButtonPress. */ if (f != 0) - f->mouse_moved = 0; - - if (!tool_bar_p) - last_tool_bar_item = -1; + { + f->mouse_moved = 0; + if (!tool_bar_p) + f->last_tool_bar_item = -1; + } } break; } @@ -4564,9 +4565,9 @@ w32_read_socket (struct terminal *terminal, should reflect only motion after the ButtonPress. */ f->mouse_moved = 0; + f->last_tool_bar_item = -1; } dpyinfo->last_mouse_frame = f; - last_tool_bar_item = -1; } break; @@ -6454,7 +6455,6 @@ w32_initialize (void) &w32_use_visible_system_caret, 0)) w32_use_visible_system_caret = 0; - last_tool_bar_item = -1; any_help_event_p = 0; /* Initialize input mode: interrupt_input off, no flow control, allow |