projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5fc05db
)
(Ffontset_font): Fix previous change.
author
Kenichi Handa
<handa@m17n.org>
Tue, 18 Aug 2009 00:37:11 +0000
(
00:37
+0000)
committer
Kenichi Handa
<handa@m17n.org>
Tue, 18 Aug 2009 00:37:11 +0000
(
00:37
+0000)
src/ChangeLog
patch
|
blob
|
history
src/fontset.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index ec96d133a28fbc3958038a2bf4b737c8f337f3dc..ac13ccbe01df4a03ed0964e51f04111b1516209a 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,7
+1,7
@@
-2009-08-1
7
Kenichi Handa <handa@m17n.org>
+2009-08-1
8
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 2bac86c19c30cd72693bf5986b112d510ce8d02b..f8eb0c86eb89c5fda2c069d40bdf4de9c5e3ae31 100644
(file)
--- 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))
{