forked from aniani/vim
patch 9.0.0238: Shift-Tab shows matches on cmdline when 'wildmenu' is off
Problem: Shift-Tab shows matches on cmdline when 'wildmenu' is off. Solution: Only show matches when 'wildmode' contains "list". (closes #10951)
This commit is contained in:
parent
e24a14118c
commit
300175fd7f
@ -2033,7 +2033,12 @@ getcmdline_int(
|
|||||||
{
|
{
|
||||||
if (nextwild(&xpc, WILD_EXPAND_KEEP, 0, firstc != '@') == OK)
|
if (nextwild(&xpc, WILD_EXPAND_KEEP, 0, firstc != '@') == OK)
|
||||||
{
|
{
|
||||||
if (xpc.xp_numfiles > 1)
|
if (xpc.xp_numfiles > 1
|
||||||
|
&& ((!did_wild_list && (wim_flags[wim_index] & WIM_LIST))
|
||||||
|
#ifdef FEAT_WILDMENU
|
||||||
|
|| p_wmnu)
|
||||||
|
#endif
|
||||||
|
)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_WILDMENU
|
#ifdef FEAT_WILDMENU
|
||||||
// Trigger the popup menu when wildoptions=pum
|
// Trigger the popup menu when wildoptions=pum
|
||||||
|
@ -874,6 +874,24 @@ func Test_cmdline_complete_user_cmd()
|
|||||||
call feedkeys(":Foo b\\x\<Tab>\<Home>\"\<cr>", 'tx')
|
call feedkeys(":Foo b\\x\<Tab>\<Home>\"\<cr>", 'tx')
|
||||||
call assert_equal('"Foo b\x', @:)
|
call assert_equal('"Foo b\x', @:)
|
||||||
delcommand Foo
|
delcommand Foo
|
||||||
|
|
||||||
|
redraw
|
||||||
|
call assert_equal('~', Screenline(&lines - 1))
|
||||||
|
command! FooOne :
|
||||||
|
command! FooTwo :
|
||||||
|
|
||||||
|
set nowildmenu
|
||||||
|
call feedkeys(":Foo\<Tab>\<Home>\"\<cr>", 'tx')
|
||||||
|
call assert_equal('"FooOne', @:)
|
||||||
|
call assert_equal('~', Screenline(&lines - 1))
|
||||||
|
|
||||||
|
call feedkeys(":Foo\<S-Tab>\<Home>\"\<cr>", 'tx')
|
||||||
|
call assert_equal('"FooTwo', @:)
|
||||||
|
call assert_equal('~', Screenline(&lines - 1))
|
||||||
|
|
||||||
|
delcommand FooOne
|
||||||
|
delcommand FooTwo
|
||||||
|
set wildmenu&
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_complete_user_cmd()
|
func Test_complete_user_cmd()
|
||||||
|
@ -731,6 +731,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
238,
|
||||||
/**/
|
/**/
|
||||||
237,
|
237,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user