Mercurial > hg > xemacs-beta
changeset 5308:17c381a2f377
Fix my last change when both --with-union-type and --with-xft, thanks Robert.
2010-11-24 Aidan Kehoe <kehoea@parhasard.net>
* font-mgr.c (Ffc_pattern_get): Fix my last change when both
--with-union-type and --with-xft are specified, thank you Robert
Delius Royar!
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 24 Nov 2010 17:54:57 +0000 |
| parents | c096d8051f89 |
| children | c290121b0c3f 8d29f1c4bb98 |
| files | src/ChangeLog src/font-mgr.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Nov 20 16:49:11 2010 +0000 +++ b/src/ChangeLog Wed Nov 24 17:54:57 2010 +0000 @@ -1,3 +1,9 @@ +2010-11-24 Aidan Kehoe <kehoea@parhasard.net> + + * font-mgr.c (Ffc_pattern_get): Fix my last change when both + --with-union-type and --with-xft are specified, thank you Robert + Delius Royar! + 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * abbrev.c (Fexpand_abbrev):
--- a/src/font-mgr.c Sat Nov 20 16:49:11 2010 +0000 +++ b/src/font-mgr.c Wed Nov 24 17:54:57 2010 +0000 @@ -440,7 +440,7 @@ { #ifdef HAVE_BIGNUM check_integer_range (id, Qzero, make_integer (INT_MAX)); - int_id = BIGNUMP (id) ? bignum_to_int (id) : XINT (id); + int_id = BIGNUMP (id) ? bignum_to_int (XBIGNUM_DATA (id)) : XINT (id); #else check_integer_range (id, Qzero, make_integer (EMACS_INT_MAX)); int_id = XINT (id);