aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2007-10-31 09:40:12 +0000
committerYAMAMOTO Mitsuharu2007-10-31 09:40:12 +0000
commit7837948ffc1fd83f8d285e27f14e2acfaa9a01b3 (patch)
treed727a6530e06413f12d29e97ae5298d6f42d9de7 /src
parent5126b171eaefd2e59570f2f1f10665d39565fd6b (diff)
downloademacs-7837948ffc1fd83f8d285e27f14e2acfaa9a01b3.tar.gz
emacs-7837948ffc1fd83f8d285e27f14e2acfaa9a01b3.zip
[USE_ATSUI] (Fmac_atsu_font_face_attributes):
Fix conversion from Lisp object to ATSUFontID.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macfns.c4
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 @@
12007-10-31 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * macfns.c [USE_ATSUI] (Fmac_atsu_font_face_attributes):
4 Fix conversion from Lisp object to ATSUFontID.
5
12007-10-30 Jason Rumney <jasonr@gnu.org> 62007-10-30 Jason Rumney <jasonr@gnu.org>
2 7
3 * xdisp.c (Fformat_mode_line): Do nothing when noninteractive. 8 * 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. */)
4621 Lisp_Object result; 4621 Lisp_Object result;
4622 4622
4623 check_mac (); 4623 check_mac ();
4624 CHECK_NUMBER_OR_FLOAT(id); 4624 CHECK_NUMBER_OR_FLOAT (id);
4625 font_id = NUMBERP (id) ? XINT (id) : (ATSUFontID) XFLOAT (id); 4625 font_id = INTEGERP (id) ? XINT (id) : XFLOAT_DATA (id);
4626 BLOCK_INPUT; 4626 BLOCK_INPUT;
4627 result = mac_atsu_font_face_attributes (font_id); 4627 result = mac_atsu_font_face_attributes (font_id);
4628 UNBLOCK_INPUT; 4628 UNBLOCK_INPUT;