(Finternal_char_font): Fix compilation warning.

diff --git a/src/ChangeLog b/src/ChangeLog
index eee3f678e51b2d9490c71fa0a92a4f55a4b36f37..f753ef11714de4ce726b718cae025f2e512b5dd0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-16  Glenn Morris  <rgm@gnu.org>
+
+       * fontset.c (Finternal_char_font): Fix compilation warning.
+
 2008-02-16  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (init_user_info): Use TOKEN_USER and TOKEN_PRIMARY_GROUP

diff --git a/src/fontset.c b/src/fontset.c
index e2d59ede8d270643b79c2f477f8453371ceb307a..765fac0b9d842f13e66275caf9e7265b3fdbd1c1 100644 (file)
--- 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)));