From: Kim F. Storm <storm@cua.dk>
Date: Fri, 24 Mar 2006 15:24:20 +0000 (+0000)
Subject: (handle_one_xevent): Don't let key-press clear mouse face
X-Git-Tag: emacs-pretest-22.0.90~3440
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99c60e860c171ee2cb6325655a9c10c3f31083c8;p=emacs.git

(handle_one_xevent): Don't let key-press clear mouse face
on in toolbar window if mouse-highlight is an integer.
---

diff --git a/src/xterm.c b/src/xterm.c
index 82f3565f6c4..0ca086b58db 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -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;