comparison src/eval.c @ 17887:39ffd167a307 v8.1.1940

patch 8.1.1940: script tests fail Commit: https://github.com/vim/vim/commit/34ed68d40eb9c71f34a44b94263f5e7e6856cba0 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 29 22:48:24 2019 +0200 patch 8.1.1940: script tests fail Problem: Script tests fail. Solution: Don't set vimvars type in set_vim_var_nr().
author Bram Moolenaar <Bram@vim.org>
date Thu, 29 Aug 2019 23:00:03 +0200
parents 5e2d8840da11
children e4d3b6c466d4
comparison
equal deleted inserted replaced
17886:302f29000890 17887:39ffd167a307
7877 else if (argvars[0].v_type == VAR_BLOB) 7877 else if (argvars[0].v_type == VAR_BLOB)
7878 { 7878 {
7879 int i; 7879 int i;
7880 typval_T tv; 7880 typval_T tv;
7881 7881
7882 set_vim_var_type(VV_KEY, VAR_NUMBER);
7882 for (i = 0; i < b->bv_ga.ga_len; i++) 7883 for (i = 0; i < b->bv_ga.ga_len; i++)
7883 { 7884 {
7884 tv.v_type = VAR_NUMBER; 7885 tv.v_type = VAR_NUMBER;
7885 tv.vval.v_number = blob_get(b, i); 7886 tv.vval.v_number = blob_get(b, i);
7886 set_vim_var_nr(VV_KEY, idx); 7887 set_vim_var_nr(VV_KEY, idx);
7905 } 7906 }
7906 } 7907 }
7907 else 7908 else
7908 { 7909 {
7909 // argvars[0].v_type == VAR_LIST 7910 // argvars[0].v_type == VAR_LIST
7911 set_vim_var_type(VV_KEY, VAR_NUMBER);
7912
7910 for (li = l->lv_first; li != NULL; li = nli) 7913 for (li = l->lv_first; li != NULL; li = nli)
7911 { 7914 {
7912 if (map && var_check_lock(li->li_tv.v_lock, arg_errmsg, TRUE)) 7915 if (map && var_check_lock(li->li_tv.v_lock, arg_errmsg, TRUE))
7913 break; 7916 break;
7914 nli = li->li_next; 7917 nli = li->li_next;