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

diff --git a/src/ChangeLog b/src/ChangeLog
index f27aed26bef9ddd2006d4b90a4f5ed233ea1f249..a614d670fbad63333ea1f86b52c97d191842ddfb 100644 (file)
--- 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 557f1fbcddc4c63f6f933f23037c5f545258c022..5f1d59afe22fc1a1d493cb227b67888e3b9829c8 100644 (file)
--- 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;