patch 9.0.0236: popup menu not removed when 'wildmenu' reset while visible
Problem: Popup menu not removed when 'wildmenu' reset while it is visible.
Solution: Do not check p_wmnu, only pum_visible(). (closes #10953)
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index fb329a5..cdf8395 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -367,7 +367,7 @@
*/
int cmdline_pum_active(void)
{
- return p_wmnu && pum_visible() && compl_match_array != NULL;
+ return pum_visible() && compl_match_array != NULL;
}
/*
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 521312a..be688e3 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -3234,4 +3234,14 @@
call delete('Xcmdline_redraw_tabline')
endfunc
+func Test_wildmenu_pum_disable_while_shown()
+ set wildoptions=pum
+ set wildmenu
+ cnoremap <F2> <Cmd>set nowildmenu<CR>
+ call feedkeys(":sign \<Tab>\<F2>\<Esc>", 'tx')
+ call assert_equal(0, pumvisible())
+ cunmap <F2>
+ set wildoptions& wildmenu&
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 616f748..c12d3c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -732,6 +732,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 236,
+/**/
235,
/**/
234,