aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2009-08-18 00:37:11 +0000
committerKenichi Handa2009-08-18 00:37:11 +0000
commit563a866ec7622fae212d12cca2785091ff48ce8b (patch)
tree4ffcb9bc2bcbd9162fd4c6774faff56351e23b1f /src
parent5fc05db07b5ec589104764616182ffd9a1b1d65a (diff)
downloademacs-563a866ec7622fae212d12cca2785091ff48ce8b.tar.gz
emacs-563a866ec7622fae212d12cca2785091ff48ce8b.zip
(Ffontset_font): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fontset.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ec96d133a28..ac13ccbe01d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
12009-08-17 Kenichi Handa <handa@m17n.org> 12009-08-18 Kenichi Handa <handa@m17n.org>
2 2
3 * fontset.c (Ffontset_font): If a nil element is found in a 3 * fontset.c (Ffontset_font): If a nil element is found in a
4 font-group vector, break the loop. 4 font-group vector, return nil.
5 5
62009-08-17 Chong Yidong <cyd@stupidchicken.com> 62009-08-17 Chong Yidong <cyd@stupidchicken.com>
7 7
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. */)
2117 2117
2118 val = AREF (elt, j); 2118 val = AREF (elt, j);
2119 if (NILP (val)) 2119 if (NILP (val))
2120 break; 2120 return Qnil;
2121 repertory = AREF (val, 1); 2121 repertory = AREF (val, 1);
2122 if (INTEGERP (repertory)) 2122 if (INTEGERP (repertory))
2123 { 2123 {