summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/list.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/list.c b/src/list.c
index 866de18718..b62c14164f 100644
--- a/src/list.c
+++ b/src/list.c
@@ -2185,8 +2185,13 @@ filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap)
nli = li->li_next;
set_vim_var_nr(VV_KEY, idx);
if (filter_map_one(&li->li_tv, expr, filtermap,
- &newtv, &rem) == FAIL || did_emsg)
+ &newtv, &rem) == FAIL)
break;
+ if (did_emsg)
+ {
+ clear_tv(&newtv);
+ break;
+ }
if (filtermap == FILTERMAP_MAP)
{
// map(): replace the list item value
diff --git a/src/version.c b/src/version.c
index 8cf37f0ade..91477bcef2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1971,
+/**/
1970,
/**/
1969,