# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1250554896 0
# Node ID 61b86c490f920d6a52d6e169c613201524fc763c
# Parent  eb3f2c155d07e93dabc3f34356c10cae3ce165af
*** empty log message ***

diff -r eb3f2c155d07 -r 61b86c490f92 src/fontset.c
--- a/src/fontset.c	Mon Aug 17 23:50:26 2009 +0000
+++ b/src/fontset.c	Tue Aug 18 00:21:36 2009 +0000
@@ -2083,6 +2083,7 @@
 DEFUN ("fontset-font", Ffontset_font, Sfontset_font, 2, 3, 0,
        doc: /* Return a font name pattern for character CH in fontset NAME.
 If NAME is t, find a pattern in the default fontset.
+If NAME is nil, find a pattern in the fontset of the selected frame.
 
 The value has the form (FAMILY . REGISTRY), where FAMILY is a font
 family name and REGISTRY is a font registry name.  This is actually
@@ -2115,6 +2116,8 @@
 	      Lisp_Object family, registry;
 
 	      val = AREF (elt, j);
+	      if (NILP (val))
+		break;
 	      repertory = AREF (val, 1);
 	      if (INTEGERP (repertory))
 		{