(XTread_socket): Don't let key-press clear mouse face

on in toolbar window if mouse-highlight is an integer.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 39ae505b53d..a983cf00b77 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,7 +2,6 @@
 
         * xterm.c (handle_one_xevent):
         * w32term.c (w32_read_socket):
-        * msdos.c (dos_rawgetc):
         * macterm.c (XTread_socket): Don't let key-press clear mouse face
         on in toolbar window if mouse-highlight is an integer.
 
diff --git a/src/macterm.c b/src/macterm.c
index b78c01e129e..d30fa02e31f 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10455,7 +10455,8 @@ XTread_socket (sd, expected, hold_quit)
 
             ObscureCursor ();
 
-            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;