font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1.

2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f27aed26bef..a614d670fba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-31  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_parse_xlfd): If FONT is a font-entity and pixel
+        size in NAME is invalid, return -1.
+
 2010-01-31  David De La Harpe Golden  <david@harpegolden.net>
 
         * fileio.c (Frename_file): Correctly rename symlinks to
diff --git a/src/font.c b/src/font.c
index 557f1fbcddc..5f1d59afe22 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1122,6 +1122,8 @@ font_parse_xlfd (name, font)
           val = INTERN_FIELD (XLFD_PIXEL_INDEX);
           if (INTEGERP (val))
             ASET (font, FONT_SIZE_INDEX, val);
+          else if (FONT_ENTITY_P (font))
+            return -1;
           else
             {
               double point_size = -1;