User: stephent Date: 05/11/26 19:25:05 Modified: xemacs/src ChangeLog objects-x.c xft-fonts.c Log: Build fixes. <87hd9z2rge.fsf_-_(a)tleepslib.sk.tsukuba.ac.jp&gt; Revision Changes Path 1.475 +5 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.474 retrieving revision 1.475 diff -u -p -r1.474 -r1.475 --- ChangeLog 2005/11/26 11:45:47 1.474 +++ ChangeLog 2005/11/26 18:24:51 1.475 ＠＠ -1,3 +1,8 ＠＠ +2005-11-27 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * configure.ac (XE_COMPLEX_ARG[xft]): Remove merge detritus and + regenerate configure to fix syntax error. + 2005-11-26 Stephen J. Turnbull <stephen(a)xemacs.org&gt; Merge Xft. 1.263 +0 -1 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.262 retrieving revision 1.263 diff -u -p -r1.262 -r1.263 --- configure 2005/11/26 12:09:23 1.262 +++ configure 2005/11/26 18:24:51 1.263 ＠＠ -2340,7 +2340,6 ＠＠ unset _xft_default _xft_all_default x y fi; - , ) # If --with-gtk or --without-gtk were given then copy the value to the # equivalent enable_gtk variable. if test "${with_gtk+set}" = set; then 1.24 +0 -1 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- configure.ac 2005/11/26 11:45:48 1.23 +++ configure.ac 2005/11/26 18:24:54 1.24 ＠＠ -643,7 +643,6 ＠＠ XE_COMPLEX_ARG([xft], XE_COMPLEX_OPTION([menubars],[yes]), XE_COMPLEX_OPTION([tabs],[yes]), XE_COMPLEX_OPTION([gauges],[yes])]) - [], []) XE_MERGED_ARG([gtk], AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]), [true], [with_gtk=no]) 1.895 +11 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.894 retrieving revision 1.895 diff -u -p -r1.894 -r1.895 --- ChangeLog 2005/11/26 13:20:21 1.894 +++ ChangeLog 2005/11/26 18:25:02 1.895 ＠＠ -1,3 +1,14 ＠＠ +2005-11-27 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + Build fixes and dead code removal. + + * xft-fonts.c (Ffc_pattern_destroy): Delete. + (syms_of_xft_fonts): Delete Ffc_pattern_destroy and comment out + Fxft_name_unparse. + + * objects-x.c (DECLARE_DEBUG_FONTNAME): Renamed improved + SET_DEBUG_FONTNAME. Remove redundant debug level checks. + 2004-12-19 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * keymap.c (Fwhere_is_internal): Rewrite docstring. 1.30 +23 -35 XEmacs/xemacs/src/objects-x.c Index: objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- objects-x.c 2005/11/26 11:46:09 1.29 +++ objects-x.c 2005/11/26 18:25:03 1.30 ＠＠ -1155,11 +1155,14 ＠＠ static struct charset_reporter charset_t /* 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 = \ - debug_xft > 2 ? eistr_fullname \ -: debug_xft > 1 ? eistr_longname \ -: eistr_shortname } while (0) +#define DECLARE_DEBUG_FONTNAME(__xemacs_name) \ + Eistring *__xemacs_name; \ + do \ + { \ + __xemacs_name = debug_xft > 2 ? eistr_fullname \ +: debug_xft > 1 ? eistr_longname \ +: eistr_shortname; \ + } while (0) #endif /* USE_XFT */ ＠＠ -1302,11 +1305,8 ＠＠ x_find_charset_font (Lisp_Object device, if (cr->rfc3066) { - if (debug_xft > 0) - { - SET_DEBUG_FONTNAME (name); - CHECKING_LANG (0, eidata(name), cr->language); - } + DECLARE_DEBUG_FONTNAME (name); + CHECKING_LANG (0, eidata(name), cr->language); lang = cr->rfc3066; } else if (cr->charset) ＠＠ -1348,12 +1348,9 ＠＠ x_find_charset_font (Lisp_Object device, should have the full thing internally as truename, and filter stuff the client doesn't want to see on output. Should we just store it into the truename right here? */ - if (debug_xft > 0) - { - SET_DEBUG_FONTNAME (name); - DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(name), lang); - } + DECLARE_DEBUG_FONTNAME (name); + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(name), lang); #ifdef RETURN_LONG_FONTCONFIG_NAMES result = eimake_string(eistr_fullname); #else ＠＠ -1362,12 +1359,9 ＠＠ x_find_charset_font (Lisp_Object device, } else { - if (debug_xft > 0) - { - SET_DEBUG_FONTNAME (name); - DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(name), lang); - } + DECLARE_DEBUG_FONTNAME (name); + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(name), lang); result = Qnil; } ＠＠ -1394,12 +1388,9 ＠＠ x_find_charset_font (Lisp_Object device, } else if (FcLangSetHasLang (v.u.l, lang) != FcLangDifferentLang) { - if (debug_xft > 0) - { - SET_DEBUG_FONTNAME (name); - DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(name), lang); - } + DECLARE_DEBUG_FONTNAME (name); + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(name), lang); #ifdef RETURN_LONG_FONTCONFIG_NAMES result = eimake_string(eistr_fullname); #else ＠＠ -1408,12 +1399,9 ＠＠ x_find_charset_font (Lisp_Object device, } else { - if (debug_xft > 0) - { - SET_DEBUG_FONTNAME (name); - DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(name), lang); - } + DECLARE_DEBUG_FONTNAME (name); + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(name), lang); result = Qnil; } } ＠＠ -1434,7 +1422,7 ＠＠ x_find_charset_font (Lisp_Object device, DEBUG_XFT1 (0, "shit happens, try X11 charset match for %s\n", XSTRING_DATA(font)); -#undef SET_DEBUG_FONTNAME +#undef DECLARE_DEBUG_FONTNAME #endif /* USE_XFT */ LISP_STRING_TO_EXTERNAL (font, patternext, Qx_font_name_encoding); 1.3 +2 -22 XEmacs/xemacs/src/xft-fonts.c Index: xft-fonts.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xft-fonts.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- xft-fonts.c 2005/11/26 11:46:11 1.2 +++ xft-fonts.c 2005/11/26 18:25:03 1.3 ＠＠ -463,25 +463,6 ＠＠ Xft v.2: encoding, charwidth, charheigh } } -#if 0 -/* #### delete this after some testing!! don't forget the DEFSUBR */ -/* #### This is a big mistake, no? --- crap, there's no implicit finalizer */ -DEFUN("fc-pattern-destroy", Ffc_pattern_destroy, 1, 1, 0, /* -Explicitly deallocate a fc pattern object PATTERN. */ - (pattern)) -{ - CHECK_FCPATTERN(pattern); - - /* paranoia strikes deep */ - if (XFCPATTERN_PTR(pattern)) - { - FcPatternDestroy(XFCPATTERN_PTR(pattern)); - XFCPATTERN_PTR(pattern) = 0; - } - return Qnil; -} -#endif - DEFUN("fc-font-match", Ffc_font_match, 2, 2, 0, /* Return the font on DEVICE that most closely matches PATTERN. ＠＠ -785,14 +766,13 ＠＠ syms_of_xft_fonts (void) DEFSUBR(Ffc_pattern_create); DEFSUBR(Ffc_name_parse); DEFSUBR(Ffc_name_unparse); +#if 0 DEFSUBR(Fxft_name_unparse); /* URK! */ +#endif DEFSUBR(Ffc_pattern_duplicate); DEFSUBR(Ffc_pattern_add); DEFSUBR(Ffc_pattern_del); DEFSUBR(Ffc_pattern_get); -#if 0 - DEFSUBR(Ffc_pattern_destroy); -#endif DEFSUBR(Ffc_list_fonts_pattern_objects); DEFSUBR(Ffc_font_sort); DEFSUBR(Ffc_font_match);