Patch 8.1.1940

[Bram Moolenaar]

Patch 8.1.1940 (after 8.1.1939)
Problem: Script tests fail.
Solution: Don't set vimvars type in set_vim_var_nr().
Files: src/eval.c, src/evalvars.c, src/proto/evalvars.pro


*** ../vim-8.1.1939/src/eval.c 2019-08-29 22:09:42.604429215 +0200
--- src/eval.c 2019-08-29 22:34:42.296035940 +0200
***************
*** 7879,7884 ****
--- 7879,7885 ----
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,7912 ****
--- 7908,7915 ----
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))
*** ../vim-8.1.1939/src/evalvars.c 2019-08-29 22:09:42.608429189 +0200
--- src/evalvars.c 2019-08-29 22:33:18.820463809 +0200
***************
*** 1691,1702 ****
}

/*
* 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;
}

--- 1691,1710 ----
}

/*
+ * 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_nr = val;
}

*** ../vim-8.1.1939/src/proto/evalvars.pro 2019-08-29 22:09:42.608429189 +0200
--- src/proto/evalvars.pro 2019-08-29 22:33:22.800443371 +0200
***************
*** 15,20 ****
--- 15,21 ----
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);
*** ../vim-8.1.1939/src/version.c 2019-08-29 22:09:42.608429189 +0200
--- src/version.c 2019-08-29 22:28:19.898010551 +0200
***************
*** 763,764 ****
--- 763,766 ----
{ /* Add new patch number below this line */
+ /**/
+ 1940,
/**/

--
Never eat yellow snow.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///