diff options
| author | Paul Eggert | 2011-06-21 23:18:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-21 23:18:06 -0700 |
| commit | b79e8648b908c6600b99c20d4782e6413d6907ef (patch) | |
| tree | 784f88ad15072d8ec32312c2c2df03119906ff12 /src | |
| parent | 0766b489e1b34964bb43db221fe967d54ac5ec5e (diff) | |
| download | emacs-b79e8648b908c6600b99c20d4782e6413d6907ef.tar.gz emacs-b79e8648b908c6600b99c20d4782e6413d6907ef.zip | |
* font.c (font_score): Use EMACS_INT, not int, to store XINT value.
Diffstat (limited to 'src')
| -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 @@ | |||
| 1 | 2011-06-22 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * font.c (font_score): Use EMACS_INT, not int, to store XINT value. | ||
| 4 | |||
| 3 | * dispextern.h (struct face.stipple): | 5 | * dispextern.h (struct face.stipple): |
| 4 | * image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap) | 6 | * image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap) |
| 5 | (x_bitmap_mask, x_allocate_bitmap_record) | 7 | (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) | |||
| 2107 | { | 2107 | { |
| 2108 | /* We use the higher 6-bit for the actual size difference. The | 2108 | /* We use the higher 6-bit for the actual size difference. The |
| 2109 | lowest bit is set if the DPI is different. */ | 2109 | lowest bit is set if the DPI is different. */ |
| 2110 | int diff; | 2110 | EMACS_INT diff; |
| 2111 | int pixel_size = XINT (spec_prop[FONT_SIZE_INDEX]); | 2111 | EMACS_INT pixel_size = XINT (spec_prop[FONT_SIZE_INDEX]); |
| 2112 | 2112 | ||
| 2113 | if (CONSP (Vface_font_rescale_alist)) | 2113 | if (CONSP (Vface_font_rescale_alist)) |
| 2114 | pixel_size *= font_rescale_ratio (entity); | 2114 | pixel_size *= font_rescale_ratio (entity); |