summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 51e6a34ea..68a779fd0 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4628,7 +4628,7 @@ do_set(arg, opt_flags)
if ((!(flags & P_COMMA) || *s != ',')
&& vim_strchr(s + 1, *s) != NULL)
{
- STRCPY(s, s + 1);
+ mch_memmove(s, s + 1, STRLEN(s));
--s;
}
}
diff --git a/src/version.c b/src/version.c
index 22467d358..c3b268bee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 37,
+/**/
36,
/**/
35,