updated for version 7.1-055
diff --git a/src/eval.c b/src/eval.c
index 1b26747..30bae9c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13807,7 +13807,7 @@
 	    }
 	    /* Shorten "remain". */
 	    if (*q != NUL)
-		STRCPY(remain, q - 1);
+		mch_memmove(remain, q - 1, STRLEN(q - 1) + 1);
 	    else
 	    {
 		vim_free(remain);