Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- 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;
 	}
     }