Skip to content

Commit a28a2eb

Browse files
zeertzjqchrisbra
authored andcommitted
patch 9.1.1739: Matches may be listed twice with wildmode=longest,list
Problem: Matches may be listed twice with wildmode=longest,list when "longest" doesn't change command line (after 9.1.1737). Solution: Set did_wild_list when trying "list" after "longest" (zeertzjq). closes: #18227 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 708ab7f commit a28a2eb

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

src/ex_getln.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,8 @@ cmdline_wildchar_complete(
10381038
nextwild(xp, WILD_NEXT, options, escape);
10391039
(void)showmatches(xp, p_wmnu, wim_list_next,
10401040
wim_noselect_next);
1041+
if (wim_list_next)
1042+
*did_wild_list = TRUE;
10411043
}
10421044
}
10431045
}

src/testdir/test_cmdline.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2829,6 +2829,8 @@ func Test_wildmenu_pum()
28292829
call term_sendkeys(buf, "\<C-U>set wildmode=longest,list\<CR>")
28302830
call term_sendkeys(buf, ":cn\<Tab>")
28312831
call VerifyScreenDump(buf, 'Test_wildmenu_pum_30', {})
2832+
call term_sendkeys(buf, "\<Tab>")
2833+
call VerifyScreenDump(buf, 'Test_wildmenu_pum_30', {})
28322834
call term_sendkeys(buf, "s")
28332835
call VerifyScreenDump(buf, 'Test_wildmenu_pum_31', {})
28342836

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,8 @@ static char *(features[]) =
724724

725725
static int included_patches[] =
726726
{ /* Add new patch number below this line */
727+
/**/
728+
1739,
727729
/**/
728730
1738,
729731
/**/

0 commit comments

Comments
 (0)