mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
updated for version 7.1-113
This commit is contained in:
13
src/eval.c
13
src/eval.c
@@ -1318,7 +1318,6 @@ restore_vimvar(idx, save_tv)
|
|||||||
{
|
{
|
||||||
hashitem_T *hi;
|
hashitem_T *hi;
|
||||||
|
|
||||||
clear_tv(&vimvars[idx].vv_tv);
|
|
||||||
vimvars[idx].vv_tv = *save_tv;
|
vimvars[idx].vv_tv = *save_tv;
|
||||||
if (vimvars[idx].vv_type == VAR_UNKNOWN)
|
if (vimvars[idx].vv_type == VAR_UNKNOWN)
|
||||||
{
|
{
|
||||||
@@ -1362,7 +1361,6 @@ eval_spell_expr(badword, expr)
|
|||||||
|
|
||||||
if (p_verbose == 0)
|
if (p_verbose == 0)
|
||||||
--emsg_off;
|
--emsg_off;
|
||||||
vimvars[VV_VAL].vv_str = NULL;
|
|
||||||
restore_vimvar(VV_VAL, &save_val);
|
restore_vimvar(VV_VAL, &save_val);
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
@@ -9387,15 +9385,16 @@ filter_map_one(tv, expr, map, remp)
|
|||||||
{
|
{
|
||||||
typval_T rettv;
|
typval_T rettv;
|
||||||
char_u *s;
|
char_u *s;
|
||||||
|
int retval = FAIL;
|
||||||
|
|
||||||
copy_tv(tv, &vimvars[VV_VAL].vv_tv);
|
copy_tv(tv, &vimvars[VV_VAL].vv_tv);
|
||||||
s = expr;
|
s = expr;
|
||||||
if (eval1(&s, &rettv, TRUE) == FAIL)
|
if (eval1(&s, &rettv, TRUE) == FAIL)
|
||||||
return FAIL;
|
goto theend;
|
||||||
if (*s != NUL) /* check for trailing chars after expr */
|
if (*s != NUL) /* check for trailing chars after expr */
|
||||||
{
|
{
|
||||||
EMSG2(_(e_invexpr2), s);
|
EMSG2(_(e_invexpr2), s);
|
||||||
return FAIL;
|
goto theend;
|
||||||
}
|
}
|
||||||
if (map)
|
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
|
/* On type error, nothing has been removed; return FAIL to stop the
|
||||||
* loop. The error message was given by get_tv_number_chk(). */
|
* loop. The error message was given by get_tv_number_chk(). */
|
||||||
if (error)
|
if (error)
|
||||||
return FAIL;
|
goto theend;
|
||||||
}
|
}
|
||||||
|
retval = OK;
|
||||||
|
theend:
|
||||||
clear_tv(&vimvars[VV_VAL].vv_tv);
|
clear_tv(&vimvars[VV_VAL].vv_tv);
|
||||||
return OK;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
113,
|
||||||
/**/
|
/**/
|
||||||
112,
|
112,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user