From be6173675697e098b28c5e552dabfb55778f1ca4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 16 Feb 2008 22:33:01 +0000 Subject: [PATCH] (Finternal_char_font): Fix compilation warning. --- src/ChangeLog | 4 ++++ src/fontset.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index eee3f678e51..f753ef11714 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-02-16 Glenn Morris + + * fontset.c (Finternal_char_font): Fix compilation warning. + 2008-02-16 Eli Zaretskii * 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, struct font *font = XSAVE_VALUE (font_object)->pointer; unsigned code = font->driver->encode_char (font, c); Lisp_Object fontname = font_get_name (font_object); + /* Assignment to EMACS_INT stops GCC whining about limited range + of data type. */ + EMACS_INT cod = code; if (code == FONT_INVALID_CODE) return Qnil; - if (code <= MOST_POSITIVE_FIXNUM) + if (cod <= MOST_POSITIVE_FIXNUM) return Fcons (fontname, make_number (code)); return Fcons (fontname, Fcons (make_number (code >> 16), make_number (code & 0xFFFF))); -- 2.39.2