From: Kenichi Handa <handa@m17n.org>
Date: Thu, 9 Oct 2008 12:12:33 +0000 (+0000)
Subject: (font_delete_unmatched): Fix previous change.  Don't
X-Git-Tag: emacs-pretest-23.0.90~2590
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c576d6dc9e6ca5212e8c74cd25316f664704c8d3;p=emacs.git

(font_delete_unmatched): Fix previous change.  Don't
reject an entity if DPI and AVGWIDTH of an entity are 0.
---

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;