(w32_read_socket): Don't let key-press clear mouse face
authorKim F. Storm <storm@cua.dk>
Fri, 24 Mar 2006 15:24:05 +0000 (15:24 +0000)
committerKim F. Storm <storm@cua.dk>
Fri, 24 Mar 2006 15:24:05 +0000 (15:24 +0000)
on in toolbar window if mouse-highlight is an integer.

src/w32term.c

index 7d530e7..f0ef42f 100644 (file)
@@ -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;