2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc57bdaba26..9ce8dce3604 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-18  Kenichi Handa  <handa@gnu.org>
+
+        * font.c (Ffont_spec): Signal an error for an invalid font name.
+
 2013-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Move functions from lisp.h to individual modules when possible.
diff --git a/src/font.c b/src/font.c
index 7bd44a5e52f..231df2ef71a 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3863,7 +3863,8 @@ usage: (font-spec ARGS...)  */)
       if (EQ (key, QCname))
         {
           CHECK_STRING (val);
-          font_parse_name (SSDATA (val), SBYTES (val), spec);
+          if (font_parse_name (SSDATA (val), SBYTES (val), spec) < 0)
+            error ("Invalid font name: %s", SSDATA (val));
           font_put_extra (spec, key, val);
         }
       else