]> git.eshelyaron.com Git - emacs.git/commitdiff
(handle_one_xevent): Don't let key-press clear mouse face
authorKim F. Storm <storm@cua.dk>
Fri, 24 Mar 2006 15:24:20 +0000 (15:24 +0000)
committerKim F. Storm <storm@cua.dk>
Fri, 24 Mar 2006 15:24:20 +0000 (15:24 +0000)
on in toolbar window if mouse-highlight is an integer.

src/xterm.c

index 82f3565f6c4f4ced538ae2f56ced9349e6a226f9..0ca086b58db0068d8085a6af03e3b1aee8aea130 100644 (file)
@@ -6083,7 +6083,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
       f = x_any_window_to_frame (dpyinfo, event.xkey.window);
 
-      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;