Merge from trunk

1 files changed, 6 insertions, 5 deletions

diff --git a/src/data.c b/src/data.c
index 9490b7ac79a..78ccb75ca89 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2092,13 +2092,14 @@ ARRAY may be a vector, a string, a char-table, a bool-vector,
 or a byte-code object.  IDX starts at 0.  */)
   (register Lisp_Object array, Lisp_Object idx)
 {
-  register int idxval;
+  register EMACS_INT idxval;
 
   CHECK_NUMBER (idx);
   idxval = XINT (idx);
   if (STRINGP (array))
     {
-      int c, idxval_byte;
+      int c;
+      EMACS_INT idxval_byte;
 
       if (idxval < 0 || idxval >= SCHARS (array))
         args_out_of_range (array, idx);
@@ -2146,7 +2147,7 @@ Return NEWELT.  ARRAY may be a vector, a string, a char-table or a
 bool-vector.  IDX starts at 0.  */)
   (register Lisp_Object array, Lisp_Object idx, Lisp_Object newelt)
 {
-  register int idxval;
+  register EMACS_INT idxval;
 
   CHECK_NUMBER (idx);
   idxval = XINT (idx);
@@ -2181,7 +2182,7 @@ bool-vector.  IDX starts at 0.  */)
     }
   else if (STRING_MULTIBYTE (array))
     {
-      int idxval_byte, prev_bytes, new_bytes, nbytes;
+      EMACS_INT idxval_byte, prev_bytes, new_bytes, nbytes;
       unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1;
 
       if (idxval < 0 || idxval >= SCHARS (array))
@@ -2197,7 +2198,7 @@ bool-vector.  IDX starts at 0.  */)
       if (prev_bytes != new_bytes)
         {
           /* We must relocate the string data.  */
-          int nchars = SCHARS (array);
+          EMACS_INT nchars = SCHARS (array);
           unsigned char *str;
           USE_SAFE_ALLOCA;