2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e2683795934..360027cfa4d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.
+
         * fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.
         Use much-faster test for byte-length change.
         Don't assume string byte-length fits in 'int'.
diff --git a/src/font.c b/src/font.c
index ecb61ab6a53..4619ed68913 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4294,7 +4294,7 @@ created glyph-string.  Otherwise, the value is nil.  */)
 {
   struct font *font;
   Lisp_Object font_object, n, glyph;
-  int i, j, from, to;
+  EMACS_INT i, j, from, to;
 
   if (! composition_gstring_p (gstring))
     signal_error ("Invalid glyph-string: ", gstring);