diff options
author | Kenichi Handa <handa@m17n.org> | 2009-05-15 02:49:46 +0000 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2009-05-15 02:49:46 +0000 |
commit | cccd42d52fad213a1dc7585f3954b8af851e58b2 (patch) | |
tree | c13e3a5047ddc1f22b951808b80ac82d53726dd5 | |
parent | 337fbd17184a89fb26d9b3752ac2688b500eb761 (diff) | |
download | emacs-cccd42d52fad213a1dc7585f3954b8af851e58b2.tar.gz emacs-cccd42d52fad213a1dc7585f3954b8af851e58b2.tar.bz2 emacs-cccd42d52fad213a1dc7585f3954b8af851e58b2.zip |
(Ffont_spec): Check arguments.
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/font.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e5516d26619..5e86ae6dd56 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-05-15 Kenichi Handa <handa@m17n.org> + + * font.c (Ffont_spec): Check arguments. + 2009-05-14 Chong Yidong <cyd@stupidchicken.com> * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified diff --git a/src/font.c b/src/font.c index cdff0d678e6..19bc70dd976 100644 --- a/src/font.c +++ b/src/font.c @@ -4007,7 +4007,12 @@ usage: (font-spec ARGS...) */) for (i = 0; i < nargs; i += 2) { - Lisp_Object key = args[i], val = args[i + 1]; + Lisp_Object key = args[i], val; + + CHECK_SYMBOL (key); + if (i + 1 >= nargs) + error ("No value for key `%s'", SDATA (SYMBOL_NAME (key))); + val = args[i + 1]; if (EQ (key, QCname)) { |