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

b57d9029 · Kenichi Handa · 8fab2362 · b57d9029 · b57d9029
Commit b57d9029 authored Jan 31, 2010 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

src/ChangeLog src/ChangeLog +5 -0

src/font.c src/font.c +2 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- 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;