To: vim_dev@googlegroups.com Subject: Patch 9.0.0238 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0238 Problem: Shift-Tab shows matches on cmdline when 'wildmenu' is off. Solution: Only show matches when 'wildmode' contains "list". (closes #10951) Files: src/ex_getln.c, src/testdir/test_cmdline.vim *** ../vim-9.0.0237/src/ex_getln.c 2022-08-14 14:16:07.987582278 +0100 --- src/ex_getln.c 2022-08-21 18:37:38.340562296 +0100 *************** *** 2033,2039 **** { if (nextwild(&xpc, WILD_EXPAND_KEEP, 0, firstc != '@') == OK) { ! if (xpc.xp_numfiles > 1) { #ifdef FEAT_WILDMENU // Trigger the popup menu when wildoptions=pum --- 2033,2044 ---- { if (nextwild(&xpc, WILD_EXPAND_KEEP, 0, firstc != '@') == OK) { ! if (xpc.xp_numfiles > 1 ! && ((!did_wild_list && (wim_flags[wim_index] & WIM_LIST)) ! #ifdef FEAT_WILDMENU ! || p_wmnu) ! #endif ! ) { #ifdef FEAT_WILDMENU // Trigger the popup menu when wildoptions=pum *** ../vim-9.0.0237/src/testdir/test_cmdline.vim 2022-08-21 14:33:53.938662514 +0100 --- src/testdir/test_cmdline.vim 2022-08-21 18:36:23.845000273 +0100 *************** *** 874,879 **** --- 874,897 ---- call feedkeys(":Foo b\\x\\\"\", 'tx') call assert_equal('"Foo b\x', @:) delcommand Foo + + redraw + call assert_equal('~', Screenline(&lines - 1)) + command! FooOne : + command! FooTwo : + + set nowildmenu + call feedkeys(":Foo\\\"\", 'tx') + call assert_equal('"FooOne', @:) + call assert_equal('~', Screenline(&lines - 1)) + + call feedkeys(":Foo\\\"\", 'tx') + call assert_equal('"FooTwo', @:) + call assert_equal('~', Screenline(&lines - 1)) + + delcommand FooOne + delcommand FooTwo + set wildmenu& endfunc func Test_complete_user_cmd() *** ../vim-9.0.0237/src/version.c 2022-08-21 17:23:57.131150493 +0100 --- src/version.c 2022-08-21 18:22:51.791342057 +0100 *************** *** 733,734 **** --- 733,736 ---- { /* Add new patch number below this line */ + /**/ + 238, /**/ -- The war between Emacs and Vi is over. Vi has won with 3 to 1. http://m.linuxjournal.com/files/linuxjournal.com/linuxjournal/articles/030/3044/3044s1.html /// 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 ///