summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c2dc26764..02d5b3ebe 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5059,6 +5059,7 @@ skip:
if (did_sub)
++sub_nlines;
+ vim_free(new_start); /* for when substitute was cancelled */
vim_free(sub_firstline); /* free the copy of the original line */
sub_firstline = NULL;
}
diff --git a/src/version.c b/src/version.c
index c3803a103..ccc1c0edb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 18,
+/**/
17,
/**/
16,