From: Kenichi Handa <handa@m17n.org>
Date: Thu, 30 Apr 2009 07:01:33 +0000 (+0000)
Subject: (fontset_find_font): Check if rfont_def is Qnil or not.
X-Git-Tag: emacs-pretest-23.0.93~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d72bb827da6e6a1a4df8752ace4513349adc28d;p=emacs.git

(fontset_find_font): Check if rfont_def is Qnil or not.
---

diff --git a/src/fontset.c b/src/fontset.c
index 9007b30592e..2d3f10d493c 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -631,6 +631,8 @@ fontset_find_font (fontset, c, face, id, fallback)
       for (i++; i < ASIZE (vec); i++)
 	{
 	  rfont_def = AREF (vec, i);
+	  if (NILP (rfont_def))
+	    return Qt;
 	  if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def))
 	    break;
 	  font_object = RFONT_DEF_OBJECT (AREF (vec, i));