CVS update by stephent xemacs/src ...
User: stephent
Date: 05/12/23 13:00:48
Modified: xemacs/src ChangeLog objects-x.c
Log:
Fix crash getting truename of Xft fonts.
<878xuc2fdo.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.910 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -p -r1.909 -r1.910
--- ChangeLog 2005/12/20 22:01:50 1.909
+++ ChangeLog 2005/12/23 12:00:44 1.910
＠＠ -1,3 +1,8 ＠＠
+2005-12-23 Stephen J. Turnbull <stephen(a)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(a)parhasard.net>
* objects-x.c (x_find_charset_font):
1.32 +2 -1 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- objects-x.c 2005/12/20 22:01:52 1.31
+++ objects-x.c 2005/12/23 12:00:45 1.32
＠＠ -807,7 +807,8 ＠＠ x_font_instance_truename (Lisp_Font_Inst
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);
}