# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1264920413 -32400
# Node ID fa65fbe23fdb24b00ee39541df8eb481b9586d87
# Parent  56607edb3cea25b0232e47553d68fbfa1e04ddb9
font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1.

diff -r 56607edb3cea -r fa65fbe23fdb src/ChangeLog
--- a/src/ChangeLog	Sat Jan 30 23:49:28 2010 -0500
+++ b/src/ChangeLog	Sun Jan 31 15:46:53 2010 +0900
@@ -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 -r 56607edb3cea -r fa65fbe23fdb src/font.c
--- a/src/font.c	Sat Jan 30 23:49:28 2010 -0500
+++ b/src/font.c	Sun Jan 31 15:46:53 2010 +0900
@@ -1122,6 +1122,8 @@
 	  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;