# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1130101966 0
# Node ID e81cb0b6850a20c9586a640a3eac50a4269101ea
# Parent  c2d76d4f59b4e111bd0cbf02ec221e799f3b0dde
* xterm.c (note_mouse_movement): Always call note_mouse_highlight
so tool tips don't interfere with press on tool bar button.

diff -r c2d76d4f59b4 -r e81cb0b6850a src/ChangeLog
--- a/src/ChangeLog	Sun Oct 23 19:13:19 2005 +0000
+++ b/src/ChangeLog	Sun Oct 23 21:12:46 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-23  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (note_mouse_movement): Always call note_mouse_highlight
+	so tool tips don't interfere with press on tool bar button.
+
 2005-10-23  Richard M. Stallman  <rms@gnu.org>
 
 	* casetab.c (Fset_case_table): Doc fix.
diff -r c2d76d4f59b4 -r e81cb0b6850a src/xterm.c
--- a/src/xterm.c	Sun Oct 23 19:13:19 2005 +0000
+++ b/src/xterm.c	Sun Oct 23 21:12:46 2005 +0000
@@ -3599,15 +3599,16 @@
       return 1;
     }
 
+  note_mouse_highlight (frame, event->x, event->y);
+
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
   if (event->x < last_mouse_glyph.x
-	   || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
-	   || event->y < last_mouse_glyph.y
-	   || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
+      || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
+      || event->y < last_mouse_glyph.y
+      || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
     {
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
-      note_mouse_highlight (frame, event->x, event->y);
       /* Remember which glyph we're now on.  */
       remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
       return 1;