patch 8.1.1940: script tests fail

Problem:    Script tests fail.
Solution:   Don't set vimvars type in set_vim_var_nr().

diff --git a/src/eval.c b/src/eval.c
index 9295993b9a6c36ca3358dfc295a7e760a5c480f0..fb2f804e7c657568170be9e8cc61caad77bfe15d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -7879,6 +7879,7 @@ filter_map(typval_T *argvars, typval_T *rettv, int map)
            int         i;
            typval_T    tv;
 
+           set_vim_var_type(VV_KEY, VAR_NUMBER);
            for (i = 0; i < b->bv_ga.ga_len; i++)
            {
                tv.v_type = VAR_NUMBER;
@@ -7907,6 +7908,8 @@ filter_map(typval_T *argvars, typval_T *rettv, int map)
        else
        {
            // argvars[0].v_type == VAR_LIST
+           set_vim_var_type(VV_KEY, VAR_NUMBER);
+
            for (li = l->lv_first; li != NULL; li = nli)
            {
                if (map && var_check_lock(li->li_tv.v_lock, arg_errmsg, TRUE))

diff --git a/src/evalvars.c b/src/evalvars.c
index c087d85cc5237b69f4252dd012b564de5747661b..bbe140379facfac6b79f5337d954dc90007fb9f2 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1690,13 +1690,21 @@ get_user_var_name(expand_T *xp, int idx)
     return NULL;
 }
 
+/*
+ * Set type of v: variable to "type".
+ */
+    void
+set_vim_var_type(int idx, vartype_T type)
+{
+    vimvars[idx].vv_type = type;
+}
+
 /*
  * Set number v: variable to "val".
  */
     void
 set_vim_var_nr(int idx, varnumber_T val)
 {
-    vimvars[idx].vv_type = VAR_NUMBER;
     vimvars[idx].vv_nr = val;
 }
 

diff --git a/src/proto/evalvars.pro b/src/proto/evalvars.pro
index fde1adac19f173e1a7e1d04c7abb17bd0b3159a4..6226d43ced8819e8d9901711f9eab92ccfa6784f 100644 (file)
--- a/src/proto/evalvars.pro
+++ b/src/proto/evalvars.pro
@@ -15,6 +15,7 @@ void ex_unlet(exarg_T *eap);
 void ex_lockvar(exarg_T *eap);
 int do_unlet(char_u *name, int forceit);
 char_u *get_user_var_name(expand_T *xp, int idx);
+void set_vim_var_type(int idx, vartype_T type);
 void set_vim_var_nr(int idx, varnumber_T val);
 typval_T *get_vim_var_tv(int idx);
 varnumber_T get_vim_var_nr(int idx);

diff --git a/src/version.c b/src/version.c
index a2e9bee274a727411a345193e5a18dc51315683b..f0ccfe3b05d39ac8cce449430c351ee5d3b571fc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1940,
 /**/
     1939,
 /**/