[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fontset.c,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/src/fontset.c,v |
Date: |
Sat, 16 Feb 2008 22:32:49 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/02/16 22:32:49
Index: fontset.c
===================================================================
RCS file: /sources/emacs/emacs/src/fontset.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- fontset.c 8 Feb 2008 16:20:28 -0000 1.112
+++ fontset.c 16 Feb 2008 22:32:49 -0000 1.113
@@ -2065,10 +2065,13 @@
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)));
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Miles Bader, 2008/02/01
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/02/04
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Stefan Monnier, 2008/02/08
- [Emacs-diffs] Changes to emacs/src/fontset.c,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/02/16
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Stefan Monnier, 2008/02/26