[Emacs-diffs] trunk r113635: * frame.h (FRAME_MOUSE_UPDATE):

[Dmitry Antipov]

------------------------------------------------------------
revno: 113635
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 18:54:29 +0400
message:
  * frame.h (FRAME_MOUSE_UPDATE):
  * nsterm.m (ns_frame_up_to_date): Omit redundant check
  whether hlinfo->mouse_face_mouse_frame is non-NULL.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-01 10:33:25 +0000
+++ b/src/ChangeLog     2013-08-01 14:54:29 +0000
@@ -1,5 +1,11 @@
 2013-08-01  Dmitry Antipov  <address@hidden>
 
+       * frame.h (FRAME_MOUSE_UPDATE):
+       * nsterm.m (ns_frame_up_to_date): Omit redundant check
+       whether hlinfo->mouse_face_mouse_frame is non-NULL.
+
+2013-08-01  Dmitry Antipov  <address@hidden>
+
        Avoid redundant Lisp_Object <-> struct frame conversions in font API.
        * font.h (struct font_driver): Change list, match, and list_family
        functions to accept struct frame * as first arg.

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-08-01 06:38:49 +0000
+++ b/src/frame.h       2013-08-01 14:54:29 +0000
@@ -929,10 +929,9 @@
     if (frame == hlinfo->mouse_face_mouse_frame)               \
       {                                                                \
        block_input ();                                         \
-       if (hlinfo->mouse_face_mouse_frame)                     \
-         note_mouse_highlight (hlinfo->mouse_face_mouse_frame, \
-                               hlinfo->mouse_face_mouse_x,     \
-                               hlinfo->mouse_face_mouse_y);    \
+       note_mouse_highlight (hlinfo->mouse_face_mouse_frame,   \
+                             hlinfo->mouse_face_mouse_x,       \
+                             hlinfo->mouse_face_mouse_y);      \
        unblock_input ();                                       \
       }                                                                \
   } while (0)

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-08-01 06:38:49 +0000
+++ b/src/nsterm.m      2013-08-01 14:54:29 +0000
@@ -1883,10 +1883,9 @@
        {
          block_input ();
          ns_update_begin(f);
-         if (hlinfo->mouse_face_mouse_frame)
-           note_mouse_highlight (hlinfo->mouse_face_mouse_frame,
-                                 hlinfo->mouse_face_mouse_x,
-                                 hlinfo->mouse_face_mouse_y);
+         note_mouse_highlight (hlinfo->mouse_face_mouse_frame,
+                               hlinfo->mouse_face_mouse_x,
+                               hlinfo->mouse_face_mouse_y);
          ns_update_end(f);
          unblock_input ();
        }