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

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

(XTread_socket): Don't let key-press clear mouse face
on in toolbar window if mouse-highlight is an integer.
cf1474a2 · Kim F. Storm · 95d8aa28 · cf1474a2 · cf1474a2
Commit cf1474a2 authored Mar 24, 2006 by Kim F. Storm
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/ChangeLog src/ChangeLog +0 -1

src/macterm.c src/macterm.c +2 -1

No files found.
--- 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.
  

--- 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;