[Emacs-diffs] Changes to emacs/src/w32term.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.235 emacs/src/w32term.c:1.236
*** emacs/src/w32term.c:1.235   Wed Oct 12 12:18:29 2005
--- emacs/src/w32term.c Fri Oct 14 08:09:33 2005
***************
*** 3204,3210 ****
  static MSG last_mouse_motion_event;
  static Lisp_Object last_mouse_motion_frame;
  
! static void
  note_mouse_movement (frame, msg)
       FRAME_PTR frame;
       MSG *msg;
--- 3204,3210 ----
  static MSG last_mouse_motion_event;
  static Lisp_Object last_mouse_motion_frame;
  
! static int
  note_mouse_movement (frame, msg)
       FRAME_PTR frame;
       MSG *msg;
***************
*** 3221,3233 ****
        frame->mouse_moved = 1;
        last_mouse_scroll_bar = Qnil;
        note_mouse_highlight (frame, -1, -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)
      {
        frame->mouse_moved = 1;
        last_mouse_scroll_bar = Qnil;
--- 3221,3234 ----
        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?  */
!   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,3243 ****
--- 3238,3247 ----
         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,4319 ****
--- 4318,4324 ----
          }
  
            previous_help_echo_string = help_echo_string;
+         help_echo_string = Qnil;
  
          if (dpyinfo->grabbed && last_mouse_frame
              && FRAME_LIVE_P (last_mouse_frame))
***************
*** 4352,4358 ****
  
                  last_window=window;
                }
!             note_mouse_movement (f, &msg.msg);
            }
          else
              {
--- 4357,4364 ----
  
                  last_window=window;
                }
!             if (!note_mouse_movement (f, &msg.msg))
!               help_echo_string = previous_help_echo_string;
            }
          else
              {