Commit b57d9029 authored by Kenichi Handa's avatar Kenichi Handa

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

parent 8fab2362
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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment