diff options
| author | Johan Bockgård <bojohan@gnu.org> | 2015-05-16 22:47:30 +0200 |
|---|---|---|
| committer | Johan Bockgård <bojohan@gnu.org> | 2015-05-17 17:43:24 +0200 |
| commit | f89080d18dd64e0c92c5f3d206182d65f23eafeb (patch) | |
| tree | 0a3da3c36267c89d340bdd136be8b1cf49cb8867 /src/xterm.c | |
| parent | a0cfd563d26661ce2a509e525487644fd421966b (diff) | |
| download | emacs-f89080d18dd64e0c92c5f3d206182d65f23eafeb.tar.gz | |
Fix integer-valued `mouse-highlight' (Bug#20590)
* src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index 94d6d57072d..06ce7070bca 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7059,17 +7059,18 @@ handle_one_xevent (struct x_display_info *dpyinfo, f = any; -#if ! defined (USE_GTK) /* If mouse-highlight is an integer, input clears out mouse highlighting. */ if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) +#if ! defined (USE_GTK) && (f == 0 - || !EQ (f->tool_bar_window, hlinfo->mouse_face_window))) + || !EQ (f->tool_bar_window, hlinfo->mouse_face_window)) +#endif + ) { clear_mouse_face (hlinfo); hlinfo->mouse_face_hidden = true; } -#endif #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS if (f == 0) |