[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f89080d: Fix integer-valued `mouse-highlight' (Bug#
From: |
Johan Bockgard |
Subject: |
[Emacs-diffs] master f89080d: Fix integer-valued `mouse-highlight' (Bug#20590) |
Date: |
Sun, 17 May 2015 15:45:59 +0000 |
branch: master
commit f89080d18dd64e0c92c5f3d206182d65f23eafeb
Author: Johan Bockgård <address@hidden>
Commit: Johan Bockgård <address@hidden>
Fix integer-valued `mouse-highlight' (Bug#20590)
* src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope.
---
src/xterm.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/xterm.c b/src/xterm.c
index 94d6d57..06ce707 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f89080d: Fix integer-valued `mouse-highlight' (Bug#20590),
Johan Bockgard <=