From: Kenichi Handa <handa@m17n.org>
Date: Sun, 31 Jan 2010 06:46:53 +0000 (+0900)
Subject: font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid... 
X-Git-Tag: emacs-pretest-23.1.93~133
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b57d9029b1e2cb5e74542046c79a6dde5c0620ad;p=emacs.git

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

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;