procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kenichi Handa 2010-01-31 15:46:53 +09:00
parent 8fab23622f
commit b57d9029b1
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.
2010-01-31 David De La Harpe Golden <david@harpegolden.net>
* fileio.c (Frename_file): Correctly rename symlinks to

2
src/font.c
View file

@ -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;