summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/misc2.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 86a1f9def2..504cf0aed3 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4712,7 +4712,8 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
{
wc_path = vim_strsave(search_ctx->ffsc_wc_path);
temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
- + (STRLEN(search_ctx->ffsc_fix_path)) - len));
+ + STRLEN(search_ctx->ffsc_fix_path + len)
+ + 1));
}
if (temp == NULL || wc_path == NULL)
diff --git a/src/version.c b/src/version.c
index d5622106fd..ade1bf5287 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2,
+/**/
1,
/**/
0