[Emacs-diffs] /srv/bzr/emacs/trunk r99427: font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1. (Bug#5396)

[Kenichi Handa]

------------------------------------------------------------
revno: 99427 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Sun 2010-01-31 16:08:07 +0900
message:
  font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is 
invalid, return -1. (Bug#5396)
modified:
  src/ChangeLog
  src/font.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-31 05:23:09 +0000
+++ b/src/ChangeLog     2010-01-31 07:01:05 +0000
@@ -1,3 +1,8 @@
+2010-01-31  Kenichi Handa  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsterm.m (ns_defined_color): Block input.  Suggested by Mike

=== modified file 'src/font.c'
--- a/src/font.c        2010-01-13 08:35:10 +0000
+++ b/src/font.c        2010-01-31 06:46:53 +0000
@@ -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;