diff options
| author | Glenn Morris | 2008-02-16 22:33:01 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-02-16 22:33:01 +0000 |
| commit | be6173675697e098b28c5e552dabfb55778f1ca4 (patch) | |
| tree | ec77ee2b8c976b339cac4b2950b1d46a0907a6e7 /src | |
| parent | 790df309536c7c23ca960b1a3026e50fbf6a035b (diff) | |
| download | emacs-be6173675697e098b28c5e552dabfb55778f1ca4.tar.gz emacs-be6173675697e098b28c5e552dabfb55778f1ca4.zip | |
(Finternal_char_font): Fix compilation warning.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fontset.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eee3f678e51..f753ef11714 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-02-16 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * fontset.c (Finternal_char_font): Fix compilation warning. | ||
| 4 | |||
| 1 | 2008-02-16 Eli Zaretskii <eliz@gnu.org> | 5 | 2008-02-16 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * w32.c (init_user_info): Use TOKEN_USER and TOKEN_PRIMARY_GROUP | 7 | * w32.c (init_user_info): Use TOKEN_USER and TOKEN_PRIMARY_GROUP |
diff --git a/src/fontset.c b/src/fontset.c index e2d59ede8d2..765fac0b9d8 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -2065,10 +2065,13 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, | |||
| 2065 | struct font *font = XSAVE_VALUE (font_object)->pointer; | 2065 | struct font *font = XSAVE_VALUE (font_object)->pointer; |
| 2066 | unsigned code = font->driver->encode_char (font, c); | 2066 | unsigned code = font->driver->encode_char (font, c); |
| 2067 | Lisp_Object fontname = font_get_name (font_object); | 2067 | Lisp_Object fontname = font_get_name (font_object); |
| 2068 | /* Assignment to EMACS_INT stops GCC whining about limited range | ||
| 2069 | of data type. */ | ||
| 2070 | EMACS_INT cod = code; | ||
| 2068 | 2071 | ||
| 2069 | if (code == FONT_INVALID_CODE) | 2072 | if (code == FONT_INVALID_CODE) |
| 2070 | return Qnil; | 2073 | return Qnil; |
| 2071 | if (code <= MOST_POSITIVE_FIXNUM) | 2074 | if (cod <= MOST_POSITIVE_FIXNUM) |
| 2072 | return Fcons (fontname, make_number (code)); | 2075 | return Fcons (fontname, make_number (code)); |
| 2073 | return Fcons (fontname, Fcons (make_number (code >> 16), | 2076 | return Fcons (fontname, Fcons (make_number (code >> 16), |
| 2074 | make_number (code & 0xFFFF))); | 2077 | make_number (code & 0xFFFF))); |