mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-18 00:50:44 -08:00
Code Issues Projects Releases Wiki Activity

(ftfont_pattern_entity): Fix typo.

Browse source 
(ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of
locale.
This commit is contained in:
Kenichi Handa 2006-06-14 00:38:48 +00:00
parent ce4aada805
commit f0365b6f1d
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ftfont.c
View file

@ -96,7 +96,7 @@ ftfont_pattern_entity (p, frame, registry, name)
if (FcPatternGetString (p, FC_FILE, 0, &file) != FcResultMatch)
return Qnil;
if (FcPatternGetCharSet (p, FC_CHARSET, 0, &charset) == FcResultMatch)
if (FcPatternGetCharSet (p, FC_CHARSET, 0, &charset) != FcResultMatch)
charset = NULL;
entity = Fmake_vector (make_number (FONT_ENTITY_MAX), null_string);
@ -391,8 +391,13 @@ ftfont_list (frame, spec)
{
FcPattern *pat;
FcResult result;
FcValue v;
Lisp_Object entity;
if (FcPatternGet (pattern, FC_LANG, 0, &v) == FcResultNoMatch)
/* If no language is specified in PATTERN, fontconfig will use
that of the current locale. This cancel that effect. */
FcPatternAddString (pattern, FC_LANG, (FcChar8 *) "en");
FcConfigSubstitute (NULL, pattern, FcMatchPattern);
FcDefaultSubstitute (pattern);
pat = FcFontMatch (NULL, pattern, &result);