summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index c37075ba1..19b4479b6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10448,7 +10448,7 @@ findfilendir(argvars, rettv, find_what)
{
do
{
- if (rettv->v_type == VAR_STRING)
+ if (rettv->v_type == VAR_STRING || rettv->v_type == VAR_LIST)
vim_free(fresult);
fresult = find_file_in_path_option(first ? fname : NULL,
first ? (int)STRLEN(fname) : 0,
diff --git a/src/version.c b/src/version.c
index 203daed52..8bebdde19 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 */
/**/
+ 1240,
+/**/
1239,
/**/
1238,