*** empty log message ***

2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 340f8e1089f..c06400ab1a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,9 @@
         * xdisp.c (remember_mouse_glyph): Use MATRIX_BOTTOM_TEXT_ROW to
         get end of text rows.  Obtain header-line/mode-line rows directly.
 
+        * xterm.c, w32term.c, macterm.c (note_mouse_movement): Restore
+        help_echo_string if mouse is moved inside last_mouse_glyph.
+
 2005-10-12  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (remember_mouse_glyph): New generic version based on
diff --git a/src/xterm.c b/src/xterm.c
index 743247771d4..370a35fe6e6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3610,6 +3610,8 @@ note_mouse_movement (frame, event)
       /* Remember which glyph we're now on.  */
       remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
     }
+  else
+    help_echo_string = previous_help_echo_string;
 }