APPROVE COMMIT NOTE: This patch has been committed. Bugger, as the man said. This, to me, is an argument for Subversion or some other versioning system that doesn’t lock up your XEmacs for an indeterminate time when you run a diff command, either that or another, faster CVS server. lisp/ChangeLog addition: 2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * mule/chinese.el: * mule/chinese.el ('euc-china): Removed. Shouldn't have been uncommented in the first place. src/ChangeLog addition: 2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * objects-x.c (x_font_instance_truename): * objects-x.c (x_find_charset_font): Reintroduce my change of 2005-12-20 and Stephen's of 2005-12-23, which my last commit overrode. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/objects-x.c lisp/mule/chinese.el Index: lisp/mule/chinese.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/chinese.el,v retrieving revision 1.11 diff -u -u -r1.11 chinese.el --- lisp/mule/chinese.el 2005/12/24 21:24:27 1.11 +++ lisp/mule/chinese.el 2005/12/24 22:27:52 ＠＠ -266,8 +266,6 ＠＠ G2: Sisheng (PinYin - ZhuYin)" )) -(define-coding-system-alias 'euc-china 'chinese-iso-8bit) - ;; For consistency with euc-jp, euc-ko (define-coding-system-alias 'euc-cn 'cn-gb-2312) Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.34 diff -u -u -r1.34 objects-x.c --- src/objects-x.c 2005/12/24 17:33:34 1.34 +++ src/objects-x.c 2005/12/24 22:27:56 ＠＠ -808,7 +808,8 ＠＠ FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern); if (res) { - FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res)); + FONT_INSTANCE_TRUENAME (f) = + build_ext_string (res, Qxft_font_name_encoding); free (res); return FONT_INSTANCE_TRUENAME (f); } ＠＠ -1176,7 +1177,7 ＠＠ Extbyte **names; int count = 0; const Extbyte *patternext; - Lisp_Object result = Qunbound; + Lisp_Object result = Qnil; int i; /* #### with Xft need to handle second stage here -- sjt ＠＠ -1442,7 +1443,7 ＠＠ if (x_font_spec_matches_charset (XDEVICE (device), charset, intname, Qnil, 0, -1, 0)) { - result = make_string (intname, intlen); + result = build_ext_string (intname, Qx_font_name_encoding); break; } } -- 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.