diff options
| author | Kenichi Handa <[email protected]> | 2006-08-01 02:40:50 +0000 |
|---|---|---|
| committer | Kenichi Handa <[email protected]> | 2006-08-01 02:40:50 +0000 |
| commit | f0432f81a1d96a237f933ac82c1705bb5ca4cdf9 (patch) | |
| tree | 9b05332cad8891453cf56773f6f1e6c103229b12 /src/ftfont.c | |
| parent | a90fc9aa6969f0bdf4cd19fed5b29c79e5856e8c (diff) | |
(ftfont_pattern_entity): If the pattern doesn't contain
FC_SPACING, don't assuce FC_MONO.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 6c85bbf789..9bdb2146d2 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -140,7 +140,7 @@ ftfont_pattern_entity (p, frame, registry) ASET (entity, FONT_SIZE_INDEX, make_number (0)); if (FcPatternGetInteger (p, FC_SPACING, 0, &numeric) != FcResultMatch) - numeric = FC_MONO; + numeric = -1; file = FcStrCopy (file); if (! file) return Qnil; @@ -151,7 +151,8 @@ ftfont_pattern_entity (p, frame, registry) if (FcPatternAddString (p, FC_FILE, file) == FcFalse || (charset && FcPatternAddCharSet (p, FC_CHARSET, charset) == FcFalse) - || FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse) + || (numeric >= 0 + && FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse)) { FcPatternDestroy (p); return Qnil; |