diff options
| author | Miles Bader | 2007-11-11 00:56:44 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-11-11 00:56:44 +0000 |
| commit | f23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch) | |
| tree | ded28d1da6df2d0135514bac83074f4ca1c9099a /src/macfns.c | |
| parent | e2d092da5980a7d05a5428074f8eb4925fa801e8 (diff) | |
| parent | a457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff) | |
| download | emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'src/macfns.c')
| -rw-r--r-- | src/macfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macfns.c b/src/macfns.c index 0f40127637a..2b8c24db3b3 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -4644,8 +4644,8 @@ ID is specified by either an integer or a float. */) | |||
| 4644 | Lisp_Object result; | 4644 | Lisp_Object result; |
| 4645 | 4645 | ||
| 4646 | check_mac (); | 4646 | check_mac (); |
| 4647 | CHECK_NUMBER_OR_FLOAT(id); | 4647 | CHECK_NUMBER_OR_FLOAT (id); |
| 4648 | font_id = NUMBERP (id) ? XINT (id) : (ATSUFontID) XFLOAT (id); | 4648 | font_id = INTEGERP (id) ? XINT (id) : XFLOAT_DATA (id); |
| 4649 | BLOCK_INPUT; | 4649 | BLOCK_INPUT; |
| 4650 | result = mac_atsu_font_face_attributes (font_id); | 4650 | result = mac_atsu_font_face_attributes (font_id); |
| 4651 | UNBLOCK_INPUT; | 4651 | UNBLOCK_INPUT; |