# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1129277373 0
# Node ID 824b4c76ae12ee09e4ff88b03060567474c3a4d3
# Parent  abad34f080c4257a6f7c225713fc2be1f22177e1
(note_mouse_movement, w32_read_socket): Apply 2005-10-14 changes for
xterm.c.

diff -r abad34f080c4 -r 824b4c76ae12 src/w32term.c
--- a/src/w32term.c	Fri Oct 14 08:08:37 2005 +0000
+++ b/src/w32term.c	Fri Oct 14 08:09:33 2005 +0000
@@ -3204,7 +3204,7 @@
 static MSG last_mouse_motion_event;
 static Lisp_Object last_mouse_motion_frame;
 
-static void
+static int
 note_mouse_movement (frame, msg)
      FRAME_PTR frame;
      MSG *msg;
@@ -3221,13 +3221,14 @@
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       note_mouse_highlight (frame, -1, -1);
+      return 1;
     }
 
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
-  else if (mouse_x < last_mouse_glyph.left
-	   || mouse_x >= last_mouse_glyph.right
-	   || mouse_y < last_mouse_glyph.top
-	   || mouse_y >= last_mouse_glyph.bottom)
+  if (mouse_x < last_mouse_glyph.left
+      || mouse_x >= last_mouse_glyph.right
+      || mouse_y < last_mouse_glyph.top
+      || mouse_y >= last_mouse_glyph.bottom)
     {
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
@@ -3237,7 +3238,10 @@
 	 to keep track of the mouse for help_echo and highlighting at
 	 other times.  */
       remember_mouse_glyph (frame, mouse_x, mouse_y, &last_mouse_glyph);
+      return 1;
     }
+
+  return 0;
 }
 
 
@@ -4314,6 +4318,7 @@
 	  }
 
           previous_help_echo_string = help_echo_string;
+	  help_echo_string = Qnil;
 
 	  if (dpyinfo->grabbed && last_mouse_frame
 	      && FRAME_LIVE_P (last_mouse_frame))
@@ -4352,7 +4357,8 @@
 
 		  last_window=window;
 		}
-	      note_mouse_movement (f, &msg.msg);
+	      if (!note_mouse_movement (f, &msg.msg))
+		help_echo_string = previous_help_echo_string;
 	    }
 	  else
             {