* xterm.c (note_mouse_movement): Always call note_mouse_highlight

so tool tips don't interfere with press on tool bar button.

2 files changed, 10 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f81cd02a97a..32a55077ac9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xterm.c b/src/xterm.c
index 41abf1a77e0..a82cd8c8c97 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3599,15 +3599,16 @@ note_mouse_movement (frame, event)
       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;