diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-17 19:38:08 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-17 19:38:08 +0000 |
| commit | b4066a10e049103c3e989caca0ffdc4bd3fc61fe (patch) | |
| tree | c4265df7875ea749fc46377a2502993023c2edf7 | |
| parent | ce85c5619edb181af063e42fb19d90c040ed18c5 (diff) | |
| download | vim-git-b4066a10e049103c3e989caca0ffdc4bd3fc61fe.tar.gz | |
updated for version 7.1-113v7.1.113
| -rw-r--r-- | src/eval.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c index 37db67c43..412d31d21 100644 --- 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 62428be6a..5cd3d8f30 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 113, +/**/ 112, /**/ 111, |