diff options
| author | Miles Bader | 2007-11-09 09:45:30 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-11-09 09:45:30 +0000 |
| commit | c12ecb0af9679cc0e2fa0409931c34c035763469 (patch) | |
| tree | bd118c7ebc571de0dab542f48ad0c1648c6ccf72 /src/macfns.c | |
| parent | e83d1fe87564d06d2fcbb4006dfd9133bc340aa8 (diff) | |
| parent | 9d2185d10e3da9062672d96d3b59fcea31ff17ed (diff) | |
| download | emacs-c12ecb0af9679cc0e2fa0409931c34c035763469.tar.gz emacs-c12ecb0af9679cc0e2fa0409931c34c035763469.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-923
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 56ef81c9701..9161a0b6c6e 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; |