aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c4
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 @@
12009-01-16 Glenn Morris <rgm@gnu.org>
2
3 * font.c (Ffont_variation_glyphs): Silence compiler.
4
12009-01-15 Juanma Barranquero <lekktu@gmail.com> 52009-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