Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 164-184)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: man/mh-e.texi (Folders): Various edits.
   - Update from erc--emacs--0

 * gnus--rel--5.10  (patch 62-70)

   - Merge from emacs--devo--0
   - Update from CVS

1 files changed, 2 insertions, 1 deletions

diff --git a/src/macterm.c b/src/macterm.c
index b4b096fa541..f09b4918fb9 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10476,7 +10476,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;