updated for version 7.0-025

diff --git a/src/eval.c b/src/eval.c
index 45872be3557b4161d774a327c9a4f74153c11524..8e416494002a9c44dfd9eaf858ca6281c8dd8da3 100644 (file)
--- 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 15e38e2432184554749059dfd0b07fdbf1902c23..31af61d06e2a21665310b852bd45b643caa4f25d 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 */
+/**/
+    25,
 /**/
     24,
 /**/