diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/font.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 72f6b437af2..4aca4d0f5d6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-22 Paul Eggert <eggert@cs.ucla.edu> + * font.c (font_score): Use EMACS_INT, not int, to store XINT value. + * dispextern.h (struct face.stipple): * image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap) (x_bitmap_mask, x_allocate_bitmap_record) diff --git a/src/font.c b/src/font.c index dfc636e3313..14390335f3c 100644 --- a/src/font.c +++ b/src/font.c @@ -2107,8 +2107,8 @@ font_score (Lisp_Object entity, Lisp_Object *spec_prop) { /* We use the higher 6-bit for the actual size difference. The lowest bit is set if the DPI is different. */ - int diff; - int pixel_size = XINT (spec_prop[FONT_SIZE_INDEX]); + EMACS_INT diff; + EMACS_INT pixel_size = XINT (spec_prop[FONT_SIZE_INDEX]); if (CONSP (Vface_font_rescale_alist)) pixel_size *= font_rescale_ratio (entity); |