(bookmark-bmenu-bookmark-column): Remove var.

[gnu-emacs] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index fe05b3f036961861a7b9ac1d02cbb21da88f8492..c008ba5283792a98761b21e3ae48b5869dfac8db 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,7 +1,7 @@
 /* Header for composite sequence handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008 Free Software Foundation, Inc.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003, 2006
@@ -273,11 +273,12 @@ enum lglyph_indices
 #define LGLYPH_SET_FROM(g, val) ASET ((g), LGLYPH_IX_FROM, make_number (val))
 #define LGLYPH_SET_TO(g, val) ASET ((g), LGLYPH_IX_TO, make_number (val))
 #define LGLYPH_SET_CHAR(g, val) ASET ((g), LGLYPH_IX_CHAR, make_number (val))
+/* Callers must assure that VAL is not negative!  */
 #define LGLYPH_SET_CODE(g, val)                                                \
   do {                                                                 \
     if (val == FONT_INVALID_CODE)                                      \
       ASET ((g), LGLYPH_IX_CODE, Qnil);                                        \
-    else if (val > MOST_POSITIVE_FIXNUM)                               \
+    else if ((EMACS_INT)val > MOST_POSITIVE_FIXNUM)                    \
       ASET ((g), LGLYPH_IX_CODE, Fcons (make_number ((val) >> 16),     \
                                        make_number ((val) & 0xFFFF))); \
     else                                                               \