[Emacs-diffs] Changes to emacs/src/macterm.c,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   07/03/18 08:06:38

Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- macterm.c   10 Mar 2007 06:25:53 -0000      1.210
+++ macterm.c   18 Mar 2007 08:06:38 -0000      1.211
@@ -4484,25 +4484,24 @@
   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.  */
+      /* 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;
-    }
+
   /* 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))