mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-07 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17239 from seandewar/vim-8.2.3629

Browse Source 
vim-patch:8.2.{3433,3629}
This commit is contained in:
Sean Dewar
2022-01-31 01:04:10 +00:00
committed by GitHub
parent d38f81849b c91fbc1b9e
commit 2870311a37
6 changed files with 111 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/eval.c
View File

@@ -3218,9 +3218,8 @@ char_u *get_user_var_name(expand_T *xp, int idx)
// b: variables
// In cmdwin, the alternative buffer should be used.
hashtab_T *ht = (cmdwin_type != 0 && get_cmdline_type() == NUL)
? &prevwin->w_buffer->b_vars->dv_hashtab
: &curbuf->b_vars->dv_hashtab;
hashtab_T *ht
= is_in_cmdwin() ? &prevwin->w_buffer->b_vars->dv_hashtab : &curbuf->b_vars->dv_hashtab;
if (bdone < ht->ht_used) {
if (bdone++ == 0) {
hi = ht->ht_array;
@@ -3235,9 +3234,7 @@ char_u *get_user_var_name(expand_T *xp, int idx)
// w: variables
// In cmdwin, the alternative window should be used.
ht = (cmdwin_type != 0 && get_cmdline_type() == NUL)
? &prevwin->w_vars->dv_hashtab
: &curwin->w_vars->dv_hashtab;
ht = is_in_cmdwin() ? &prevwin->w_vars->dv_hashtab : &curwin->w_vars->dv_hashtab;
if (wdone < ht->ht_used) {
if (wdone++ == 0) {
hi = ht->ht_array;