(note_mouse_movement): Don't return immediately for

LeaveNotify case.

diff --git a/src/macterm.c b/src/macterm.c
index c85dc7da0132ac8fa186523f2a53fe2f69816800..a5a193cb88ca769765d16132c08d4d50b38ea952 100644 (file)
--- 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))