From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Thu, 1 Aug 2013 14:54:29 +0000 (+0400)
Subject: * frame.h (FRAME_MOUSE_UPDATE):
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/f8c2020882a9f78423d9918f1154655c23859530

* 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 2e327e5e6d..95ece0f897 100644
--- 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 c4c5ec23ef..723a943b90 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 7126ef56c5..59aa7f317a 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 ();
 	}