diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-28 14:15:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 14:15:49 +0800 |
| commit | 3de2a7f6df26ceb27d465d37f78306af2a4c5119 (patch) | |
| tree | d7cfe098fea11a019e21c6899a0e8e81e7a8f244 /src/nvim/eval/typval.c | |
| parent | 685ff3ee7247c5118fd8ef1c229af60066a4fcb4 (diff) | |
| parent | 3afcc48a05693738f613464607286b5684b148cd (diff) | |
| download | rneovim-3de2a7f6df26ceb27d465d37f78306af2a4c5119.tar.gz rneovim-3de2a7f6df26ceb27d465d37f78306af2a4c5119.tar.bz2 rneovim-3de2a7f6df26ceb27d465d37f78306af2a4c5119.zip | |
Merge pull request #20842 from zeertzjq/vim-8.2.1395
vim-patch:8.2.{1395,3407}
Diffstat (limited to 'src/nvim/eval/typval.c')
| -rw-r--r-- | src/nvim/eval/typval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index fb601c4307..cc6c2b5d90 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -1841,6 +1841,7 @@ dictitem_T *tv_dict_item_alloc_len(const char *const key, const size_t key_len) di->di_key[key_len] = NUL; di->di_flags = DI_FLAGS_ALLOC; di->di_tv.v_lock = VAR_UNLOCKED; + di->di_tv.v_type = VAR_UNKNOWN; return di; } @@ -2436,7 +2437,7 @@ void tv_dict_extend(dict_T *const d1, dict_T *const d2, const char *const action // Check the key to be valid when adding to any scope. if (d1->dv_scope == VAR_DEF_SCOPE && tv_is_func(di2->di_tv) - && !var_check_func_name((const char *)di2->di_key, di1 == NULL)) { + && var_wrong_func_name((const char *)di2->di_key, di1 == NULL)) { break; } if (!valid_varname((const char *)di2->di_key)) { |