updated for version 7.1-113

diff --git a/src/eval.c b/src/eval.c
index 37db67c430a336aef82952a1b3395702d190ab67..412d31d21405165410ed08d2b620968569eb457f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1318,7 +1318,6 @@ restore_vimvar(idx, save_tv)
 {
     hashitem_T *hi;
 
-    clear_tv(&vimvars[idx].vv_tv);
     vimvars[idx].vv_tv = *save_tv;
     if (vimvars[idx].vv_type == VAR_UNKNOWN)
     {
@@ -1362,7 +1361,6 @@ eval_spell_expr(badword, expr)
 
     if (p_verbose == 0)
        --emsg_off;
-    vimvars[VV_VAL].vv_str = NULL;
     restore_vimvar(VV_VAL, &save_val);
 
     return list;
@@ -9387,15 +9385,16 @@ filter_map_one(tv, expr, map, remp)
 {
     typval_T   rettv;
     char_u     *s;
+    int                retval = FAIL;
 
     copy_tv(tv, &vimvars[VV_VAL].vv_tv);
     s = expr;
     if (eval1(&s, &rettv, TRUE) == FAIL)
-       return FAIL;
+       goto theend;
     if (*s != NUL)  /* check for trailing chars after expr */
     {
        EMSG2(_(e_invexpr2), s);
-       return FAIL;
+       goto theend;
     }
     if (map)
     {
@@ -9414,10 +9413,12 @@ filter_map_one(tv, expr, map, remp)
        /* On type error, nothing has been removed; return FAIL to stop the
         * loop.  The error message was given by get_tv_number_chk(). */
        if (error)
-           return FAIL;
+           goto theend;
     }
+    retval = OK;
+theend:
     clear_tv(&vimvars[VV_VAL].vv_tv);
-    return OK;
+    return retval;
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index 62428be6af92a4eedb7f2903ebdd3eaef7ff4476..5cd3d8f3029c1a93c7399e4763ab29d1f755d11e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    113,
 /**/
     112,
 /**/