From: Kenichi Handa <handa@m17n.org>
Date: Thu, 5 Mar 2009 12:40:18 +0000 (+0000)
Subject: (fontset_find_font): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.92~330
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69a8e4848d89d57086689f0bc2c758e9ec97eac5;p=emacs.git

(fontset_find_font): Fix previous change.
---

diff --git a/src/fontset.c b/src/fontset.c
index 9f959b124e4..efccc780ed4 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -631,8 +631,7 @@ fontset_find_font (fontset, c, face, id, fallback)
 	  if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def))
 	    break;
 	  font_object = RFONT_DEF_OBJECT (AREF (vec, i));
-	  xassert (! NILP (font_object));
-	  if (font_has_char (f, font_object, c))
+	  if (! NILP (font_object) && font_has_char (f, font_object, c))
 	    return rfont_def;
 	}