* composite.c (get_composition_id, composition_gstring_put_cache): Use EMACS_INT,

not EMACS_UINT, for indexes.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ff0fe493077f31d77990da2f46be8f7af930574..f9ed0c6cfc7282bc84f834d3930fa71fa36d8876 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
        * composite.c: Don't truncate sizes to 'int'.
        (composition_gstring_p, composition_reseat_it)
        (composition_adjust_point): Use EMACS_INT, not int.
+       (get_composition_id, composition_gstring_put_cache): Use EMACS_INT,
+       not EMACS_UINT, for indexes.
 
        * category.h (CATEGORY_SET_P): Remove unnecessary cast to EMACS_INT.
 

diff --git a/src/composite.c b/src/composite.c
index 10946835705e9054f33e3c3d2b47a99e250f1ce5..1bc7b435e113cf141f9e3c256b9f2fa628c86cc8 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -285,7 +285,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
       && VECTORP (AREF (components, 0)))
     {
       /* COMPONENTS is a glyph-string.  */
-      EMACS_UINT len = ASIZE (key);
+      EMACS_INT len = ASIZE (key);
 
       for (i = 1; i < len; i++)
        if (! VECTORP (AREF (key, i)))
@@ -293,7 +293,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
     }
   else if (VECTORP (components) || CONSP (components))
     {
-      EMACS_UINT len = ASIZE (key);
+      EMACS_INT len = ASIZE (key);
 
       /* The number of elements should be odd.  */
       if ((len % 2) == 0)
@@ -673,7 +673,7 @@ composition_gstring_put_cache (Lisp_Object gstring, EMACS_INT len)
   hash = h->hashfn (h, header);
   if (len < 0)
     {
-      EMACS_UINT j, glyph_len = LGSTRING_GLYPH_LEN (gstring);
+      EMACS_INT j, glyph_len = LGSTRING_GLYPH_LEN (gstring);
       for (j = 0; j < glyph_len; j++)
        if (NILP (LGSTRING_GLYPH (gstring, j)))
          break;