# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 743518842 0
# Node ID ad83b095ae2b532af60e468abbf10f4d4c67d0ba
# Parent  f23bd92520d1eadb3b01acd9f3b5e462c7d82b62
merge with 3.8

diff --git a/lib/backupfile.c b/lib/backupfile.c
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -216,7 +216,7 @@
      char *str1, *str2;
 {
   char *newstr;
-  char str1_length = strlen (str1);
+  int str1_length = strlen (str1);
 
   newstr = malloc (str1_length + strlen (str2) + 1);
   if (newstr == 0)