Mercurial > hg > xemacs-beta

changeset 5832:af34373e378f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged SSS libs change from xemacs-beta.
author Jeff Sparkes <jsparkes@gmail.com>
date Thu, 27 Nov 2014 14:37:46 -0500
parents 5f02d29a2a65 (diff) ad3e9b3274d5 (current diff)
children b8316d3409cd
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Nov 27 14:29:40 2014 -0500
+++ b/src/ChangeLog	Thu Nov 27 14:37:46 2014 -0500
@@ -1,3 +1,8 @@
+2014-11-23  Michael Sperber  <mike@xemacs.org>
+
+	* font-mgr.c (Ffc_name_unparse): Do the previous change to this
+	file right and parse the pattern sans the charset.
+
 2014-11-06  Vin Shelton  <acs@xemacs.org>
 
 	* sysdep.c (set_descriptor_non_blocking): Don't call ioctl() on
--- a/src/font-mgr.c	Thu Nov 27 14:29:40 2014 -0500
+++ b/src/font-mgr.c	Thu Nov 27 14:37:46 2014 -0500
@@ -269,7 +269,7 @@
   {
     FcPattern* temp = FcPatternDuplicate (XFC_PATTERN_PTR (pattern));
     FcPatternDel (temp, FC_CHARSET);
-    name = FcNameUnparse (XFC_PATTERN_PTR (pattern));
+    name = FcNameUnparse (temp);
     FcPatternDestroy (temp);
   }
   result = build_fcapi_string (name);