diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-28 11:56:29 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-06 10:01:50 +0800 |
| commit | 6b3db3f92906b1c155b11f177c9378d9ff4d7d6b (patch) | |
| tree | fc9a1173623a96b95740434882dca480ce8f3272 /src/nvim/eval.c | |
| parent | 7683199a9bf5d84745a10222feddc43343410068 (diff) | |
| download | rneovim-6b3db3f92906b1c155b11f177c9378d9ff4d7d6b.tar.gz rneovim-6b3db3f92906b1c155b11f177c9378d9ff4d7d6b.tar.bz2 rneovim-6b3db3f92906b1c155b11f177c9378d9ff4d7d6b.zip | |
vim-patch:8.2.2920: still a way to shadow a builtin function
Problem: Still a way to shadow a builtin function. (Yasuhiro Matsumoto)
Solution: Check the key when using extend(). (issue vim/vim#8302)
https://github.com/vim/vim/commit/6f1d2aa437744a7cb0206fdaa543a788c5a56c79
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 5b5b4d259c..72df343932 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -1760,11 +1760,7 @@ void set_var_lval(lval_T *lp, char *endp, typval_T *rettv, int copy, const bool semsg(_(e_dictkey), lp->ll_newkey); return; } - if ((lp->ll_tv->vval.v_dict == &globvardict - // || lp->ll_tv->vval.v_dict == &SCRIPT_ITEM(current_sctx.sc_sid)->sn_vars->sv_dict - ) - && (rettv->v_type == VAR_FUNC || rettv->v_type == VAR_PARTIAL) - && var_wrong_func_name(lp->ll_newkey, true)) { + if (tv_dict_wrong_func_name(lp->ll_tv->vval.v_dict, rettv, lp->ll_newkey)) { return; } |