* frame.h (FRAME_MOUSE_UPDATE):

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e327e5e6dcbc92d422f18f93ae41d7cc02128d4..95ece0f897027a060df584d75c217247b712fe28 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/src/frame.h b/src/frame.h
index c4c5ec23efc29ba94b052d5cc20ee740e103ff30..723a943b90c9d303ba340f7684976ff2b35da432 100644 (file)
--- 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 7126ef56c5ee6fd9cba0fa6fde12da293833a788..59aa7f317abffd716024692a54c95195884c9a8c 100644 (file)
--- 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 ();
        }