Mercurial > emacs

diff src/fontset.c @ 104319:61b86c490f92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Tue, 18 Aug 2009 00:21:36 +0000
parents b4588e2be166
children 8f1c018c050c
line wrap: on
line diff
--- 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))
 		{