]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix integer-valued `mouse-highlight' (Bug#20590)
authorJohan Bockgård <bojohan@gnu.org>
Sat, 16 May 2015 20:47:30 +0000 (22:47 +0200)
committerJohan Bockgård <bojohan@gnu.org>
Sun, 17 May 2015 15:43:24 +0000 (17:43 +0200)
* src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope.

src/xterm.c

index 94d6d57072dc92ef4d7ee1ab14a6ad491eee1550..06ce7070bcac163fa28cabe1c65aea2b333c100b 100644 (file)
@@ -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)