# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1290621297 0
# Node ID 17c381a2f377655bd241d72fda5fca656fa67104
# Parent  c096d8051f893c2a283f1c7f306a8340e470ed45
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!

diff -r c096d8051f89 -r 17c381a2f377 src/ChangeLog
--- 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):
diff -r c096d8051f89 -r 17c381a2f377 src/font-mgr.c
--- 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);