Merge from emacs--devo--0

[gnu-emacs] / src / macfns.c

diff --git a/src/macfns.c b/src/macfns.c
index 0f40127637aed84d1949294750072cdd36550803..2b8c24db3b3f53374ef26b50f1aa2c5d6206e7cc 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -4644,8 +4644,8 @@ ID is specified by either an integer or a float.  */)
   Lisp_Object result;
 
   check_mac ();
-  CHECK_NUMBER_OR_FLOAT(id);
-  font_id = NUMBERP (id) ? XINT (id) : (ATSUFontID) XFLOAT (id);
+  CHECK_NUMBER_OR_FLOAT (id);
+  font_id = INTEGERP (id) ? XINT (id) : XFLOAT_DATA (id);
   BLOCK_INPUT;
   result = mac_atsu_font_face_attributes (font_id);
   UNBLOCK_INPUT;