aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Bockgård2015-05-16 22:47:30 +0200
committerJohan Bockgård2015-05-17 17:43:24 +0200
commitf89080d18dd64e0c92c5f3d206182d65f23eafeb (patch)
tree0a3da3c36267c89d340bdd136be8b1cf49cb8867
parenta0cfd563d26661ce2a509e525487644fd421966b (diff)
downloademacs-f89080d18dd64e0c92c5f3d206182d65f23eafeb.tar.gz
emacs-f89080d18dd64e0c92c5f3d206182d65f23eafeb.zip
Fix integer-valued `mouse-highlight' (Bug#20590)
* src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope.
-rw-r--r--src/xterm.c7
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,
7059 7059
7060 f = any; 7060 f = any;
7061 7061
7062#if ! defined (USE_GTK)
7063 /* If mouse-highlight is an integer, input clears out 7062 /* If mouse-highlight is an integer, input clears out
7064 mouse highlighting. */ 7063 mouse highlighting. */
7065 if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) 7064 if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
7065#if ! defined (USE_GTK)
7066 && (f == 0 7066 && (f == 0
7067 || !EQ (f->tool_bar_window, hlinfo->mouse_face_window))) 7067 || !EQ (f->tool_bar_window, hlinfo->mouse_face_window))
7068#endif
7069 )
7068 { 7070 {
7069 clear_mouse_face (hlinfo); 7071 clear_mouse_face (hlinfo);
7070 hlinfo->mouse_face_hidden = true; 7072 hlinfo->mouse_face_hidden = true;
7071 } 7073 }
7072#endif
7073 7074
7074#if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS 7075#if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS
7075 if (f == 0) 7076 if (f == 0)