* composite.c (composition_gstring_put_cache): Use unsigned integer.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d7edbb610f7..787b3e2f448 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * composite.c (composition_gstring_put_cache): Use unsigned integer.
+
 2011-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         * composite.h, composite.c (composition_gstring_put_cache):
diff --git a/src/composite.c b/src/composite.c
index 1ce7bff2982..c18f9e8b56e 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -672,11 +672,11 @@ composition_gstring_put_cache (Lisp_Object gstring, EMACS_INT len)
   hash = h->hashfn (h, header);
   if (len < 0)
     {
-      len = LGSTRING_GLYPH_LEN (gstring);
-      for (i = 0; i < len; i++)
-        if (NILP (LGSTRING_GLYPH (gstring, i)))
+      EMACS_UINT j, glyph_len = LGSTRING_GLYPH_LEN (gstring);
+      for (j = 0; j < glyph_len; j++)
+        if (NILP (LGSTRING_GLYPH (gstring, j)))
           break;
-      len = i;
+      len = j;
     }
 
   copy = Fmake_vector (make_number (len + 2), Qnil);