Mercurial > emacs
diff src/macfns.c @ 85973:d3e87ee5aa0e
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-923
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 09 Nov 2007 09:45:30 +0000 |
| parents | 9f3a25157e4f b264e9730021 |
| children | aaec5c12908e 880960b70474 |
line wrap: on
line diff
--- a/src/macfns.c Fri Nov 09 05:20:57 2007 +0000 +++ b/src/macfns.c Fri Nov 09 09:45:30 2007 +0000 @@ -4644,8 +4644,8 @@ 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;