From 7837948ffc1fd83f8d285e27f14e2acfaa9a01b3 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Wed, 31 Oct 2007 09:40:12 +0000 Subject: [PATCH] [USE_ATSUI] (Fmac_atsu_font_face_attributes): Fix conversion from Lisp object to ATSUFontID. --- src/ChangeLog | 5 +++++ src/macfns.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8ee05c00808..c69eb2db180 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-10-31 YAMAMOTO Mitsuharu + + * macfns.c [USE_ATSUI] (Fmac_atsu_font_face_attributes): + Fix conversion from Lisp object to ATSUFontID. + 2007-10-30 Jason Rumney * xdisp.c (Fformat_mode_line): Do nothing when noninteractive. diff --git a/src/macfns.c b/src/macfns.c index 1139158f165..f2d435eb740 100644 --- 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; -- 2.39.2