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

[gnu-emacs] / src / font.c

diff --git a/src/font.c b/src/font.c
index 2141fe651c31b72d4e2589db7509ceb0e9e514ea..5f1d59afe22fc1a1d493cb227b67888e3b9829c8 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -1,6 +1,6 @@
 /* font.c -- "Font" primitives.
-   Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-   Copyright (C) 2006, 2007, 2008, 2009
+   Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008, 2009, 2010
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
@@ -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;