aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2019-09-08 22:42:24 +0200
committerGitHub <noreply@github.com>2019-09-08 22:42:24 +0200
commit77a93957d3d03f41d7a71ad60b0e59b108b828be (patch)
tree676056fd8f91e5a5f4c21358595221d1a62393a1 /src
parent554566ccea09c680ada2a894ca875568515c48b7 (diff)
parent958ca938b44ea7d6f126887f5bec98ee6d2f6f15 (diff)
downloadrneovim-77a93957d3d03f41d7a71ad60b0e59b108b828be.tar.gz
rneovim-77a93957d3d03f41d7a71ad60b0e59b108b828be.tar.bz2
rneovim-77a93957d3d03f41d7a71ad60b0e59b108b828be.zip
Merge pull request #10777 from glacambre/fix_10042
ex_getln.c: fix <S-Tab> not triggering Pmenu when wildoptions=pum
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_getln.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 6b4092b5b4..3f7bc45c2e 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -1021,9 +1021,11 @@ static int command_line_execute(VimState *state, int key)
// <S-Tab> goes to last match, in a clumsy way
if (s->c == K_S_TAB && KeyTyped) {
- if (nextwild(&s->xpc, WILD_EXPAND_KEEP, 0, s->firstc != '@') == OK
- && nextwild(&s->xpc, WILD_PREV, 0, s->firstc != '@') == OK
- && nextwild(&s->xpc, WILD_PREV, 0, s->firstc != '@') == OK) {
+ if (nextwild(&s->xpc, WILD_EXPAND_KEEP, 0, s->firstc != '@') == OK) {
+ showmatches(&s->xpc, p_wmnu
+ && ((wim_flags[s->wim_index] & WIM_LIST) == 0));
+ nextwild(&s->xpc, WILD_PREV, 0, s->firstc != '@');
+ nextwild(&s->xpc, WILD_PREV, 0, s->firstc != '@');
return command_line_changed(s);
}
}