Mercurial > emacs

diff src/font.c @ 107061:fa65fbe23fdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1.
author Kenichi Handa <handa@m17n.org>
date Sun, 31 Jan 2010 15:46:53 +0900
parents 1d1d5d9bd884
children c7ed9615fb56
line wrap: on
line diff
--- 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;