Mercurial > hg > xemacs-beta

comparison src/objects-x.c @ 3174:588878f5a654

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 5bfedec8927e
children 948bd302ca41
comparison
equal deleted inserted replaced
3173:a2331a8fccb5 3174:588878f5a654
806 { 806 {
807 /* The font is already open, we just unparse. */ 807 /* The font is already open, we just unparse. */
808 FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern); 808 FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
809 if (res) 809 if (res)
810 { 810 {
811 FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res)); 811 FONT_INSTANCE_TRUENAME (f) =
812 build_ext_string (res, Qxft_font_name_encoding);
812 free (res); 813 free (res);
813 return FONT_INSTANCE_TRUENAME (f); 814 return FONT_INSTANCE_TRUENAME (f);
814 } 815 }
815 else 816 else
816 { 817 {
1174 int stage) 1175 int stage)
1175 { 1176 {
1176 Extbyte **names; 1177 Extbyte **names;
1177 int count = 0; 1178 int count = 0;
1178 const Extbyte *patternext; 1179 const Extbyte *patternext;
1179 Lisp_Object result = Qunbound; 1180 Lisp_Object result = Qnil;
1180 int i; 1181 int i;
1181 1182
1182 /* #### with Xft need to handle second stage here -- sjt 1183 /* #### with Xft need to handle second stage here -- sjt
1183 Hm. Or maybe not. That would be cool. :-) */ 1184 Hm. Or maybe not. That would be cool. :-) */
1184 if (stage) 1185 if (stage)
1440 ALLOCA, (intname, intlen), 1441 ALLOCA, (intname, intlen),
1441 Qx_font_name_encoding); 1442 Qx_font_name_encoding);
1442 if (x_font_spec_matches_charset (XDEVICE (device), charset, 1443 if (x_font_spec_matches_charset (XDEVICE (device), charset,
1443 intname, Qnil, 0, -1, 0)) 1444 intname, Qnil, 0, -1, 0))
1444 { 1445 {
1445 result = make_string (intname, intlen); 1446 result = build_ext_string (intname, Qx_font_name_encoding);
1446 break; 1447 break;
1447 } 1448 }
1448 } 1449 }
1449 1450
1450 if (names) 1451 if (names)