Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f0365b6f
Commit
f0365b6f
authored
Jun 14, 2006
by
Kenichi Handa
Browse files
(ftfont_pattern_entity): Fix typo.
(ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of locale.
parent
ce4aada8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
src/ftfont.c
src/ftfont.c
+6
-1
No files found.
src/ftfont.c
View file @
f0365b6f
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment