# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1264921687 -32400
# Node ID efefb2cc67750e19cec244ddde2ee46b22a7daba
# Parent  bb5cb7ece094e23282ea6de03a42203842be6810# Parent  5e5fc9c53be3a25eefadc185cbb5656cbd394be4
font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1. (Bug#5396)

diff -r bb5cb7ece094 -r efefb2cc6775 src/ChangeLog
--- a/src/ChangeLog	Sun Jan 31 00:23:09 2010 -0500
+++ b/src/ChangeLog	Sun Jan 31 16:08:07 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 (Bug#5396).
+
 2010-01-31  Chong Yidong  <cyd@stupidchicken.com>
 
 	* nsterm.m (ns_defined_color): Block input.  Suggested by Mike
diff -r bb5cb7ece094 -r efefb2cc6775 src/font.c
--- a/src/font.c	Sun Jan 31 00:23:09 2010 -0500
+++ b/src/font.c	Sun Jan 31 16:08:07 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;