[USE_ATSUI] (Fmac_atsu_font_face_attributes):

Fix conversion from Lisp object to ATSUFontID.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ee05c00808155d5d9453e81d70dac3af1a9bb6a..c69eb2db180b9f25b2fae29a19203e6baeab3260 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-31  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macfns.c [USE_ATSUI] (Fmac_atsu_font_face_attributes):
+       Fix conversion from Lisp object to ATSUFontID.
+
 2007-10-30  Jason Rumney  <jasonr@gnu.org>
 
        * xdisp.c (Fformat_mode_line): Do nothing when noninteractive.

diff --git a/src/macfns.c b/src/macfns.c
index 1139158f1656993fd71653c4462a22f31fe1a7e2..f2d435eb74044ebb4c18e27c93cc23d5844b6eb0 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -4621,8 +4621,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;