Mercurial > hg > xemacs-beta
diff src/fontcolor-xlike-inc.c @ 5922:4b055de36bb9 cygwin
merging heads 2
| author | Henry Thompson <ht@markup.co.uk> |
|---|---|
| date | Fri, 27 Feb 2015 17:47:15 +0000 |
| parents | 15b0715c204d |
| children |
line wrap: on
line diff
--- a/src/fontcolor-xlike-inc.c Wed Apr 23 22:22:37 2014 +0100 +++ b/src/fontcolor-xlike-inc.c Fri Feb 27 17:47:15 2015 +0000 @@ -505,7 +505,9 @@ FcPattern *p = FcFontRenderPrepare (fcc, fontxft, fontxft); Extbyte *name; - /* full name, including language coverage and repertoire */ + /* full name, including language coverage and repertoire + we delete 'charset' here because FcNameUnparse chokes on it */ + FcPatternDel (p, FC_CHARSET); name = (Extbyte *) FcNameUnparse (p); eicpy_ext (eistr_fullname, (name ? name : "NOT FOUND"), @@ -514,7 +516,6 @@ /* long name, omitting coverage and repertoire, plus a number of rarely useful properties */ - FcPatternDel (p, FC_CHARSET); FcPatternDel (p, FC_LANG); #ifdef FC_WIDTH FcPatternDel (p, FC_WIDTH);