Mercurial > hg > xemacs-beta
changeset 3174:588878f5a654
[xemacs-hg @ 2005-12-24 22:31:47 by aidan]
Revert a couple of changes from those last commits.
| author | aidan |
|---|---|
| date | Sat, 24 Dec 2005 22:31:53 +0000 |
| parents | a2331a8fccb5 |
| children | f102dbecac7b |
| files | lisp/ChangeLog lisp/mule/chinese.el src/ChangeLog src/objects-x.c |
| diffstat | 4 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Dec 24 21:59:21 2005 +0000 +++ b/lisp/ChangeLog Sat Dec 24 22:31:53 2005 +0000 @@ -1,3 +1,9 @@ +2005-12-24 Aidan Kehoe <kehoea@parhasard.net> + + * mule/chinese.el: + * mule/chinese.el ('euc-china): Removed. Shouldn't have been + uncommented in the first place. + 2005-12-24 Aidan Kehoe <kehoea@parhasard.net> * mule/mule-cmds.el (set-language-environment-coding-systems):
--- a/lisp/mule/chinese.el Sat Dec 24 21:59:21 2005 +0000 +++ b/lisp/mule/chinese.el Sat Dec 24 22:31:53 2005 +0000 @@ -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)
--- a/src/ChangeLog Sat Dec 24 21:59:21 2005 +0000 +++ b/src/ChangeLog Sat Dec 24 22:31:53 2005 +0000 @@ -1,3 +1,10 @@ +2005-12-24 Aidan Kehoe <kehoea@parhasard.net> + + * 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. + 2005-12-24 Aidan Kehoe <kehoea@parhasard.net> * event-Xt.c:
--- a/src/objects-x.c Sat Dec 24 21:59:21 2005 +0000 +++ b/src/objects-x.c Sat Dec 24 22:31:53 2005 +0000 @@ -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; } }