From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 7 Apr 2013 10:51:29 +0000 (+0200)
Subject: * nsterm.m (ns_mouse_position): Use NS_FRAME_P instead of checking
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~513
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95c0e83b2a0995ef774d25163d4f66c23399da36;p=emacs.git

* nsterm.m (ns_mouse_position): Use NS_FRAME_P instead of checking
f->output_data.ns.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 75a7388f2c4..545df8e050f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (ns_mouse_position): Use NS_FRAME_P instead of checking
+	f->output_data.ns.
+
 2013-04-07  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
diff --git a/src/nsterm.m b/src/nsterm.m
index bc3150c0a07..f5b48ee4b11 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1883,7 +1883,7 @@ ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
         f = dpyinfo->x_focus_frame ? dpyinfo->x_focus_frame
                                     : SELECTED_FRAME ();
 
-      if (f && f->output_data.ns)  /* TODO: 2nd check no longer needed? */
+      if (f && FRAME_NS_P (f))
         {
           view = FRAME_NS_VIEW (*fp);