2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 68c0054114c..5131d48eff5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-24  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * xdisp.c (string_from_display_spec): Don't use int for vector length.
+
         * indent.c (Fvertical_motion): Fix == vs = typo.
 
 2011-09-24  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/xdisp.c b/src/xdisp.c
index 3f545fae248..a556236835c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1226,7 +1226,7 @@ string_from_display_spec (Lisp_Object spec)
     }
   else if (VECTORP (spec))
     {
-      int i;
+      ptrdiff_t i;
 
       for (i = 0; i < ASIZE (spec); i++)
         {