From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 14 Oct 2005 08:10:05 +0000 (+0000)
Subject: (note_mouse_movement, w32_read_socket): Apply 2005-10-14 changes for
X-Git-Tag: emacs-pretest-22.0.90~6614
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc5c75503bfc9f04b32be4cfe2400ec24f29ca7b;p=emacs.git

(note_mouse_movement, w32_read_socket): Apply 2005-10-14 changes for
xterm.c.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6c63a3cd20b..3bc5ca526f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (note_mouse_movement, XTread_socket): Apply 2005-10-14
+	changes for xterm.c.
+
+	* w32term.c (note_mouse_movement, w32_read_socket): Likewise.
+
 2005-10-14  Kenichi Handa  <handa@m17n.org>
 
 	* search.c (search_buffer): Give up BM search on case-fold-search
diff --git a/src/w32term.c b/src/w32term.c
index 96d26344b53..dcb56de911f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3204,7 +3204,7 @@ construct_drag_n_drop (result, msg, f)
 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 @@ note_mouse_movement (frame, msg)
       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 @@ note_mouse_movement (frame, msg)
 	 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 @@ w32_read_socket (sd, expected, hold_quit)
 	  }
 
           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 @@ w32_read_socket (sd, expected, hold_quit)
 
 		  last_window=window;
 		}
-	      note_mouse_movement (f, &msg.msg);
+	      if (!note_mouse_movement (f, &msg.msg))
+		help_echo_string = previous_help_echo_string;
 	    }
 	  else
             {