From: Johan Bockgård <bojohan@gnu.org>
Date: Sat, 16 May 2015 20:47:30 +0000 (+0200)
Subject: Fix integer-valued `mouse-highlight' (Bug#20590)
X-Git-Tag: emacs-25.0.90~2073
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f89080d18dd64e0c92c5f3d206182d65f23eafeb;p=emacs.git

Fix integer-valued `mouse-highlight' (Bug#20590)

* src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope.
---

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)