auto upstream

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 222be9575b8..dd51eb9ed3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fsubstitute_in_file_name): Use ptrdiff_t, not int,
+        for string length.
+
 2012-12-08  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (unsetenv): Return 0 if the input string is too long.
diff --git a/src/fileio.c b/src/fileio.c
index de3b84ba95d..56c340bfa40 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1590,7 +1590,7 @@ those `/' is discarded.  */)
 {
   char *nm, *s, *p, *o, *x, *endp;
   char *target = NULL;
-  int total = 0;
+  ptrdiff_t total = 0;
   bool substituted = 0;
   bool multibyte;
   char *xnm;