# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1223554353 0
# Node ID bd9b20fa24a649f9b98812e7f33e2c390ce875ed
# Parent  93f43f5f37231e095c4bfa6bd40cc35048416f25
(font_delete_unmatched): Fix previous change.  Don't
reject an entity if DPI and AVGWIDTH of an entity are 0.

diff -r 93f43f5f3723 -r bd9b20fa24a6 src/font.c
--- a/src/font.c	Thu Oct 09 08:26:33 2008 +0000
+++ b/src/font.c	Thu Oct 09 12:12:33 2008 +0000
@@ -2665,11 +2665,13 @@
       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;