aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.c
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2006-03-24 15:24:05 +0000
committerKim F. Storm <[email protected]>2006-03-24 15:24:05 +0000
commit442a3a967099dbb69724c4e0955c80d52cb76e42 (patch)
treedb43409e7476918f430fea7093120e948dad9b16 /src/w32term.c
parentcf1474a2829418212b0c28f43a24fda8359c6267 (diff)
(w32_read_socket): Don't let key-press clear mouse face
on in toolbar window if mouse-highlight is an integer.
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 7d530e7ea6..f0ef42f798 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4260,7 +4260,8 @@ w32_read_socket (sd, expected, hold_quit)
if (f && !f->iconified)
{
- if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+ if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+ && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
{
clear_mouse_face (dpyinfo);
dpyinfo->mouse_face_hidden = 1;
@@ -4283,7 +4284,8 @@ w32_read_socket (sd, expected, hold_quit)
if (f && !f->iconified)
{
- if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+ if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+ && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
{
clear_mouse_face (dpyinfo);
dpyinfo->mouse_face_hidden = 1;