* frame.h (FRAME_MOUSE_UPDATE):

* nsterm.m (ns_frame_up_to_date): Omit redundant check
whether hlinfo->mouse_face_mouse_frame is non-NULL.

3 files changed, 12 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e327e5e6dc..95ece0f8970 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2013-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * 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  <dmantipov@yandex.ru>
+
         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.
diff --git a/src/frame.h b/src/frame.h
index c4c5ec23efc..723a943b90c 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -929,10 +929,9 @@ typedef struct frame *FRAME_PTR;
     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)
diff --git a/src/nsterm.m b/src/nsterm.m
index 7126ef56c5e..59aa7f317ab 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1883,10 +1883,9 @@ ns_frame_up_to_date (struct frame *f)
         {
           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 ();
         }