diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-09-28 21:00:27 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2019-10-02 22:29:42 +0200 |
| commit | b781f2b07273195e526628319fca02aa2544f612 (patch) | |
| tree | 54b86f03e0d1e752747f81951dc864caa4b0982b | |
| parent | e63fdf63ba057877573dbb3171a8c7ae698cf1bc (diff) | |
| download | rneovim-b781f2b07273195e526628319fca02aa2544f612.tar.gz rneovim-b781f2b07273195e526628319fca02aa2544f612.tar.bz2 rneovim-b781f2b07273195e526628319fca02aa2544f612.zip | |
[release-0.4] cmdline: wildmenumode() should be true with wildoptions+=pum
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | test/functional/ui/popupmenu_spec.lua | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 1f753608d2..b6e679e3ea 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -18747,8 +18747,9 @@ static void f_visualmode(typval_T *argvars, typval_T *rettv, FunPtr fptr) */ static void f_wildmenumode(typval_T *argvars, typval_T *rettv, FunPtr fptr) { - if (wild_menu_showing) + if (wild_menu_showing || ((State & CMDLINE) && pum_visible())) { rettv->vval.v_number = 1; + } } /// "win_findbuf()" function diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua index ae2136f451..37eb550835 100644 --- a/test/functional/ui/popupmenu_spec.lua +++ b/test/functional/ui/popupmenu_spec.lua @@ -516,6 +516,7 @@ describe('ui/ext_popupmenu', function() {1:~ }| :sign ^ | ]]) + eq(0, funcs.wildmenumode()) feed('<tab>') screen:expect{grid=[[ @@ -530,6 +531,7 @@ describe('ui/ext_popupmenu', function() {1:~ }| :sign define^ | ]], popupmenu={items=wild_expected, pos=0, anchor={1, 9, 6}}} + eq(1, funcs.wildmenumode()) feed('<left>') screen:expect{grid=[[ @@ -589,6 +591,7 @@ describe('ui/ext_popupmenu', function() :sign unplace^ | ]], popupmenu={items=wild_expected, pos=5, anchor={1, 9, 6}}} feed('<esc>') + eq(0, funcs.wildmenumode()) -- check positioning with multibyte char in pattern command("e långfile1") |