From c576d6dc9e6ca5212e8c74cd25316f664704c8d3 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 9 Oct 2008 12:12:33 +0000 Subject: [PATCH] (font_delete_unmatched): Fix previous change. Don't reject an entity if DPI and AVGWIDTH of an entity are 0. --- src/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/font.c b/src/font.c index fa179d624b..c291d4da36 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; -- 2.20.1