diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-10-09 12:12:33 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-10-09 12:12:33 +0000 |
| commit | c576d6dc9e6ca5212e8c74cd25316f664704c8d3 (patch) | |
| tree | 19a2f3cee10db687af4f5ad54d130b13713ae8dd /src/font.c | |
| parent | 1bf7273525fbc3657d861630efe006dd8f66783a (diff) | |
| download | emacs-c576d6dc9e6ca5212e8c74cd25316f664704c8d3.tar.gz | |
(font_delete_unmatched): Fix previous change. Don't
reject an entity if DPI and AVGWIDTH of an entity are 0.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/font.c b/src/font.c index fa179d624b5..c291d4da364 100644 --- a/src/font.c +++ b/src/font.c @@ -2665,11 +2665,13 @@ font_delete_unmatched (list, spec, size) if (prop < FONT_SPEC_MAX && INTEGERP (AREF (spec, FONT_DPI_INDEX)) && INTEGERP (AREF (entity, FONT_DPI_INDEX)) + && XINT (AREF (entity, FONT_DPI_INDEX)) != 0 && ! EQ (AREF (spec, FONT_DPI_INDEX), AREF (entity, FONT_DPI_INDEX))) prop = FONT_SPEC_MAX; if (prop < FONT_SPEC_MAX && INTEGERP (AREF (spec, FONT_AVGWIDTH_INDEX)) && INTEGERP (AREF (entity, FONT_AVGWIDTH_INDEX)) + && XINT (AREF (entity, FONT_AVGWIDTH_INDEX)) != 0 && ! EQ (AREF (spec, FONT_AVGWIDTH_INDEX), AREF (entity, FONT_AVGWIDTH_INDEX))) prop = FONT_SPEC_MAX; |