[Emacs-diffs] Changes to emacs/src/xdisp.c,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/12/10 23:44:45

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1132
retrieving revision 1.1133
diff -u -b -r1.1132 -r1.1133
--- xdisp.c     10 Dec 2006 23:28:57 -0000      1.1132
+++ xdisp.c     10 Dec 2006 23:44:44 -0000      1.1133
@@ -21856,7 +21856,7 @@
     }
 
   /* Change the mouse cursor.  */
-  if (draw == DRAW_NORMAL_TEXT)
+  if (draw == DRAW_NORMAL_TEXT && !EQ (dpyinfo->mouse_face_window, 
f->tool_bar_window))
     rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->text_cursor);
   else if (draw == DRAW_MOUSE_FACE)
     rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->hand_cursor);