To: vim_dev@googlegroups.com Subject: Patch 9.0.0236 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0236 Problem: Popup menu not removed when 'wildmenu' reset while it is visible. Solution: Do not check p_wmnu, only pum_visible(). (closes #10953) Files: src/cmdexpand.c, src/testdir/test_cmdline.vim *** ../vim-9.0.0235/src/cmdexpand.c 2022-08-20 19:26:11.039073212 +0100 --- src/cmdexpand.c 2022-08-21 14:29:59.115402789 +0100 *************** *** 367,373 **** */ int cmdline_pum_active(void) { ! return p_wmnu && pum_visible() && compl_match_array != NULL; } /* --- 367,373 ---- */ int cmdline_pum_active(void) { ! return pum_visible() && compl_match_array != NULL; } /* *** ../vim-9.0.0235/src/testdir/test_cmdline.vim 2022-08-11 14:13:14.866778338 +0100 --- src/testdir/test_cmdline.vim 2022-08-21 14:29:59.115402789 +0100 *************** *** 3234,3237 **** --- 3234,3247 ---- 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 *** ../vim-9.0.0235/src/version.c 2022-08-21 11:37:11.116916204 +0100 --- src/version.c 2022-08-21 14:32:17.754964265 +0100 *************** *** 733,734 **** --- 733,736 ---- { /* Add new patch number below this line */ + /**/ + 236, /**/ -- Two cows are standing together in a field. One asks the other: "So what do you think about this Mad Cow Disease?" The other replies: "That doesn't concern me. I'm a helicopter." /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///