diff options
| author | Glenn Morris | 2009-01-16 03:26:29 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-01-16 03:26:29 +0000 |
| commit | b60861e61fcb51c9cd07a446d97628ca344ef82c (patch) | |
| tree | 0efe729a0a7248313b88cab8627674ca572c0a81 /src | |
| parent | 133ea5b2b2f5ffd21ee9aa218fcd6ac5ff315a81 (diff) | |
| download | emacs-b60861e61fcb51c9cd07a446d97628ca344ef82c.tar.gz emacs-b60861e61fcb51c9cd07a446d97628ca344ef82c.zip | |
(Ffont_variation_glyphs): Silence compiler.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6ec71d10cc2..84ce85150bb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-01-16 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * font.c (Ffont_variation_glyphs): Silence compiler. | ||
| 4 | |||
| 1 | 2009-01-15 Juanma Barranquero <lekktu@gmail.com> | 5 | 2009-01-15 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * sound.c (SOUND_WARNING): Use _snprintf, for MSVC compatibility. | 7 | * sound.c (SOUND_WARNING): Use _snprintf, for MSVC compatibility. |
diff --git a/src/font.c b/src/font.c index b7f4c42fc62..178e6d32429 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -4451,8 +4451,10 @@ where | |||
| 4451 | { | 4451 | { |
| 4452 | Lisp_Object code; | 4452 | Lisp_Object code; |
| 4453 | int vs = (i < 16 ? 0xFE00 + i : 0xE0100 + (i - 16)); | 4453 | int vs = (i < 16 ? 0xFE00 + i : 0xE0100 + (i - 16)); |
| 4454 | /* Stops GCC whining about limited range of data type. */ | ||
| 4455 | EMACS_INT var = variations[i]; | ||
| 4454 | 4456 | ||
| 4455 | if (variations[i] > MOST_POSITIVE_FIXNUM) | 4457 | if (var > MOST_POSITIVE_FIXNUM) |
| 4456 | code = Fcons (make_number ((variations[i]) >> 16), | 4458 | code = Fcons (make_number ((variations[i]) >> 16), |
| 4457 | make_number ((variations[i]) & 0xFFFF)); | 4459 | make_number ((variations[i]) & 0xFFFF)); |
| 4458 | else | 4460 | else |