From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 18 Mar 2007 08:06:38 +0000 (+0000)
Subject: (note_mouse_movement): Don't return immediately for
X-Git-Tag: emacs-pretest-22.0.96~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a0ace5b78160de383444758feec3fc1d153467e;p=emacs.git

(note_mouse_movement): Don't return immediately for
LeaveNotify case.
---

diff --git a/src/macterm.c b/src/macterm.c
index c85dc7da013..a5a193cb88c 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4484,25 +4484,24 @@ note_mouse_movement (frame, pos)
   last_mouse_motion_position = *pos;
   XSETFRAME (last_mouse_motion_frame, frame);
 
+  if (frame == dpyinfo->mouse_face_mouse_frame
 #if TARGET_API_MAC_CARBON
-  if (!PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r)))
+      && !PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r))
 #else
-  if (!PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect))
+      && !PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect)
 #endif
+      )
     {
-      if (frame == dpyinfo->mouse_face_mouse_frame)
-	/* This case corresponds to LeaveNotify in X11.  */
-	{
-	  /* If we move outside the frame, then we're certainly no
-	     longer on any text in the frame.  */
-	  clear_mouse_face (dpyinfo);
-	  dpyinfo->mouse_face_mouse_frame = 0;
-	  if (!dpyinfo->grabbed)
-	    rif->define_frame_cursor (frame,
-				      frame->output_data.mac->nontext_cursor);
-	}
-      return 1;
+      /* This case corresponds to LeaveNotify in X11.  If we move
+	 outside the frame, then we're certainly no longer on any text
+	 in the frame.  */
+      clear_mouse_face (dpyinfo);
+      dpyinfo->mouse_face_mouse_frame = 0;
+      if (!dpyinfo->grabbed)
+	rif->define_frame_cursor (frame,
+				  frame->output_data.mac->nontext_cursor);
     }
+
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
   if (frame != last_mouse_glyph_frame
       || !PtInRect (*pos, &last_mouse_glyph))