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

Fix font-size handling bug.

Browse source
This commit is contained in:
Kenichi Handa 2011-02-17 16:47:29 +09:00
parent 4648b91b09
commit dbc0543206
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2011-02-17 Kenichi Handa <handa@m17n.org>
* font.c (font_open_entity): Be sure to set scaled_pixel_size.
(font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
integer.
2011-02-13 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (redisplay_internal): Resynchronize `w' if the selected

4
src/font.c
View file

@ -3042,7 +3042,7 @@ font_open_entity (f, entity, pixel_size)
Lisp_Object objlist, size, val, font_object;
struct font *font;
int min_width, height;
int scaled_pixel_size;
int scaled_pixel_size = pixel_size;
font_assert (FONT_ENTITY_P (entity));
size = AREF (entity, FONT_SIZE_INDEX);
@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, c)
XSETFRAME (frame, f);
size = AREF (spec, FONT_SIZE_INDEX);
pixel_size = font_pixel_size (f, spec);
if (pixel_size == 0)
if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
{
double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);