diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-03-14 13:55:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 13:55:12 +0000 |
| commit | 2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e (patch) | |
| tree | 7da2a639663d6c46e57766b5e9cb70a6ccd63c39 /src/nvim/eval.c | |
| parent | 895ca52e4c726fd6c2cf6fbbab0d392818337ce7 (diff) | |
| parent | 365a9b074f2df3c573ae4a520084818bdd46cd3d (diff) | |
| download | rneovim-2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e.tar.gz rneovim-2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e.tar.bz2 rneovim-2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e.zip | |
Merge pull request #17488 from seandewar/vim-8.2.4428
vim-patch:8.2.{1401,1413,4428,4432,4434,4438,4442,4444,4445,4454}: tabpage patches
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 18b9039d60..b2ce15fd87 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -3257,9 +3257,7 @@ char_u *get_user_var_name(expand_T *xp, int idx) } // b: variables - // In cmdwin, the alternative buffer should be used. - hashtab_T *ht - = is_in_cmdwin() ? &prevwin->w_buffer->b_vars->dv_hashtab : &curbuf->b_vars->dv_hashtab; + const hashtab_T *ht = &prevwin_curwin()->w_buffer->b_vars->dv_hashtab; if (bdone < ht->ht_used) { if (bdone++ == 0) { hi = ht->ht_array; @@ -3273,8 +3271,7 @@ char_u *get_user_var_name(expand_T *xp, int idx) } // w: variables - // In cmdwin, the alternative window should be used. - ht = is_in_cmdwin() ? &prevwin->w_vars->dv_hashtab : &curwin->w_vars->dv_hashtab; + ht = &prevwin_curwin()->w_vars->dv_hashtab; if (wdone < ht->ht_used) { if (wdone++ == 0) { hi = ht->ht_array; |