Mercurial > hg > xemacs-beta
changeset 3164:c9423e7289d2
[xemacs-hg @ 2005-12-23 12:00:44 by stephent]
Fix crash getting truename of Xft fonts. <878xuc2fdo.fsf@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Fri, 23 Dec 2005 12:00:45 +0000 |
| parents | 04a435415e1d |
| children | 8f3f6e3dfad9 |
| files | src/ChangeLog src/objects-x.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Dec 23 11:42:35 2005 +0000 +++ b/src/ChangeLog Fri Dec 23 12:00:45 2005 +0000 @@ -1,3 +1,8 @@ +2005-12-23 Stephen J. Turnbull <stephen@xemacs.org> + + * objects-x.c (x_font_instance_truename): Mule-ize handling of + font name (Xft names are UTF-8). Fixes crash. + 2005-12-20 Aidan Kehoe <kehoea@parhasard.net> * objects-x.c (x_find_charset_font):
--- a/src/objects-x.c Fri Dec 23 11:42:35 2005 +0000 +++ b/src/objects-x.c Fri Dec 23 12:00:45 2005 +0000 @@ -807,7 +807,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); }