From: Kenichi Handa <handa@m17n.org>
Date: Tue, 18 Dec 2007 11:48:01 +0000 (+0000)
Subject: (fontset_find_font): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~118
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2fdf8fd2d7aa27d742afb26c89ec6ef34da2b78e;p=emacs.git

(fontset_find_font): Fix previous change.
---

diff --git a/src/fontset.c b/src/fontset.c
index 09a57b08a86..1c13c4e8a60 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -662,9 +662,10 @@ fontset_find_font (fontset, c, face, id, fallback)
   if (EQ (vec, Qt))
     return Qnil;
 
-  if (XINT (AREF (vec, 0)) != charset_ordered_list_tick
-      || XINT (AREF (vec, 1)) != id
-      || NILP (Fequal (AREF (vec, 2), face->lface[LFACE_FAMILY_INDEX])))
+  if (ASIZE (vec) > 4
+      && (XINT (AREF (vec, 0)) != charset_ordered_list_tick
+	  || XINT (AREF (vec, 1)) != id
+	  || NILP (Fequal (AREF (vec, 2), face->lface[LFACE_FAMILY_INDEX]))))
     /* We have just created VEC,
        or the charset priorities were changed,
        or the preferred charset was changed,