[PATCH] Re: [AC21.5] Xft merge to mainline

Ar an séú lá is fiche de mí na Samhain, scríobh Jérôme Marant: As well as your patch, something like the below is needed to compile with Xft enabled. src/ChangeLog addition: 2005-11-26 Aidan Kehoe <kehoea(a)parhasard.net&gt; * objects-x.c: * objects-x.c (SET_DEBUG_FONTNAME): Make it content-free. * objects-x.c (x_find_charset_font): Don't use name, it's not declared. * xft-fonts.c (syms_of_xft_fonts): Fxft_name_unparse doesn't exist. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/xft-fonts.c src/objects-x.c Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.29 diff -u -u -r1.29 objects-x.c --- src/objects-x.c 2005/11/26 11:46:09 1.29 +++ src/objects-x.c 2005/11/26 14:36:53 ＠＠ -1155,12 +1155,13 ＠＠ /* Choose appropriate font name for debug messages. Use only in the top half of next function (enforced with #undef). */ -#define SET_DEBUG_FONTNAME(name) \ - do { name = \ +#define SET_DEBUG_FONTNAME(name) +#if 0 + do { name = \ debug_xft > 2 ? eistr_fullname \ : debug_xft > 1 ? eistr_longname \ : eistr_shortname } while (0) - +#endif /* 0 */ #endif /* USE_XFT */ /* find a font spec that matches font spec FONT and also matches ＠＠ -1305,7 +1306,7 ＠＠ if (debug_xft > 0) { SET_DEBUG_FONTNAME (name); - CHECKING_LANG (0, eidata(name), cr->language); + CHECKING_LANG (0, eidata(eistr_shortname), cr->language); } lang = cr->rfc3066; } ＠＠ -1352,7 +1353,7 ＠＠ { SET_DEBUG_FONTNAME (name); DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(name), lang); + eidata(eistr_shortname), lang); } #ifdef RETURN_LONG_FONTCONFIG_NAMES result = eimake_string(eistr_fullname); ＠＠ -1366,7 +1367,7 ＠＠ { SET_DEBUG_FONTNAME (name); DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(name), lang); + eidata(eistr_shortname), lang); } result = Qnil; } ＠＠ -1398,7 +1399,7 ＠＠ { SET_DEBUG_FONTNAME (name); DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(name), lang); + eidata(eistr_shortname), lang); } #ifdef RETURN_LONG_FONTCONFIG_NAMES result = eimake_string(eistr_fullname); ＠＠ -1412,7 +1413,7 ＠＠ { SET_DEBUG_FONTNAME (name); DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(name), lang); + eidata(eistr_shortname), lang); } result = Qnil; } Index: src/xft-fonts.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xft-fonts.c,v retrieving revision 1.2 diff -u -u -r1.2 xft-fonts.c --- src/xft-fonts.c 2005/11/26 11:46:11 1.2 +++ src/xft-fonts.c 2005/11/26 14:36:54 ＠＠ -785,7 +785,9 ＠＠ DEFSUBR(Ffc_pattern_create); DEFSUBR(Ffc_name_parse); DEFSUBR(Ffc_name_unparse); +#if 0 DEFSUBR(Fxft_name_unparse); /* URK! */ +#endif /* 0 */ DEFSUBR(Ffc_pattern_duplicate); DEFSUBR(Ffc_pattern_add); DEFSUBR(Ffc_pattern_del); -- I AM IN JAIL AND ALLOWED SEND ONLY ONE CABLE SINCE WAS ARRESTED WHILE MEASURING FIFTEEN FOOT WALL OUTSIDE PALACE AND HAVE JUST FINISHED COUNTING THIRTY EIGHT THOUSAND FIVE HUNDERED TWENTY TWO NAMES WHOS WHO IN MIDEAST.