From: Kenichi Handa <handa@m17n.org>
Date: Tue, 18 Aug 2009 00:37:11 +0000 (+0000)
Subject: (Ffontset_font): Fix previous change.
X-Git-Tag: emacs-pretest-23.1.90~1816
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=563a866ec7622fae212d12cca2785091ff48ce8b;p=emacs.git

(Ffontset_font): Fix previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ec96d133a28..ac13ccbe01d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
-2009-08-17  Kenichi Handa  <handa@m17n.org>
+2009-08-18  Kenichi Handa  <handa@m17n.org>
 
 	* fontset.c (Ffontset_font): If a nil element is found in a
-	font-group vector, break the loop.
+	font-group vector, return nil.
 
 2009-08-17  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/src/fontset.c b/src/fontset.c
index 2bac86c19c3..f8eb0c86eb8 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2117,7 +2117,7 @@ patterns.  */)
 
 	      val = AREF (elt, j);
 	      if (NILP (val))
-		break;
+		return Qnil;
 	      repertory = AREF (val, 1);
 	      if (INTEGERP (repertory))
 		{