diff options
author | akovaski <akaskik@gmail.com> | 2020-01-21 02:35:01 -0600 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2020-01-21 00:35:01 -0800 |
commit | 97dcc48c998ccecaa37a3cbea568d85c2f1407f9 (patch) | |
tree | c4f5b9b2b658b8b1c94a28a41349e62e3c9524c0 /src | |
parent | 99aec382596bffaa91d0a944dc9474e42331ad93 (diff) | |
download | rneovim-97dcc48c998ccecaa37a3cbea568d85c2f1407f9.tar.gz rneovim-97dcc48c998ccecaa37a3cbea568d85c2f1407f9.tar.bz2 rneovim-97dcc48c998ccecaa37a3cbea568d85c2f1407f9.zip |
wildmode: fix wildmode=longest,full with pum #11690
With "wildmode=longest,full" + wildoptions=pum, wildmode should show
popupmenu after Tab-Tab, not the horizontal wildmenu.
Fixes #11622
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/ex_getln.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 551482dab3..e6b7bfaebf 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -941,8 +941,10 @@ static int command_line_execute(VimState *state, int key) // if 'wildmode' contains "list" may still need to list if (s->xpc.xp_numfiles > 1 && !s->did_wild_list - && (wim_flags[s->wim_index] & WIM_LIST)) { - (void)showmatches(&s->xpc, false); + && ((wim_flags[s->wim_index] & WIM_LIST) + || (p_wmnu && (wim_flags[s->wim_index] & WIM_FULL) != 0))) { + (void)showmatches(&s->xpc, p_wmnu + && ((wim_flags[s->wim_index] & WIM_LIST) == 0)); redrawcmd(); s->did_wild_list = true; } |