summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2006-06-22 16:03:05 +0000
committervimboss <devnull@localhost>2006-06-22 16:03:05 +0000
commit108933a2dc78b1e33df1c673cf82f30b82b9dc2d (patch)
treee183929bebd8459a17aa5082d4d34ac1e783cf96
parentcaf9af315ffe7f83105b1248d82670b175d2dff2 (diff)
downloadvim-108933a2dc78b1e33df1c673cf82f30b82b9dc2d.tar.gz
updated for version 7.0-025v7.0.025v7-0-025
-rw-r--r--src/eval.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 45872be3..8e416494 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13250,7 +13250,7 @@ f_remove(argvars, rettv)
if (argvars[2].v_type != VAR_UNKNOWN)
EMSG2(_(e_toomanyarg), "remove()");
else if ((d = argvars[0].vval.v_dict) != NULL
- && !tv_check_lock(d->dv_lock, (char_u *)"remove()"))
+ && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
{
key = get_tv_string_chk(&argvars[1]);
if (key != NULL)
@@ -13270,7 +13270,7 @@ f_remove(argvars, rettv)
else if (argvars[0].v_type != VAR_LIST)
EMSG2(_(e_listdictarg), "remove()");
else if ((l = argvars[0].vval.v_list) != NULL
- && !tv_check_lock(l->lv_lock, (char_u *)"remove()"))
+ && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
{
int error = FALSE;
@@ -19693,6 +19693,7 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict)
v->di_tv.vval.v_list = &fc.l_varlist;
vim_memset(&fc.l_varlist, 0, sizeof(list_T));
fc.l_varlist.lv_refcount = 99999;
+ fc.l_varlist.lv_lock = VAR_FIXED;
/*
* Set a:firstline to "firstline" and a:lastline to "lastline".
diff --git a/src/version.c b/src/version.c
index 15e38e24..31af61d0 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 */
/**/
+ 25,
+/**/
24,
/**/
23,