# HG changeset patch # User Bram Moolenaar # Date 1661089503 -7200 # Node ID 5b46eb13e3bbaa75da422db5c9b3e04aba28ea7a # Parent a31b094aef7da9c5f3ffbab31d6f0a0ef4304272 patch 9.0.0236: popup menu not removed when 'wildmenu' reset while visible Commit: https://github.com/vim/vim/commit/b82a2ab8ad7af52a327cdba013ec433f7caf550d Author: zeertzjq Date: Sun Aug 21 14:33:57 2022 +0100 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 https://github.com/vim/vim/issues/10953) diff --git a/src/cmdexpand.c b/src/cmdexpand.c --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -367,7 +367,7 @@ void cmdline_pum_display(void) */ 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 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -3234,4 +3234,14 @@ func Test_cmdline_redraw_tabline() call delete('Xcmdline_redraw_tabline') endfunc +func Test_wildmenu_pum_disable_while_shown() + set wildoptions=pum + set wildmenu + cnoremap set nowildmenu + call feedkeys(":sign \\\", 'tx') + call assert_equal(0, pumvisible()) + cunmap + set wildoptions& wildmenu& +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -732,6 +732,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 236, +/**/ 235, /**/ 234,