diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim index 808a2c7d8..b3ba62069 100644 --- a/src/testdir/test_usercommands.vim +++ b/src/testdir/test_usercommands.vim @@ -589,10 +589,10 @@ func Test_command_list() \ execute('command DoCmd')) " Test output in verbose mode. - command! DoCmd : + command! -nargs=+ -complete=customlist,SomeFunc DoCmd :ls call assert_match("^\n" \ .. " Name Args Address Complete Definition\n" - \ .. " DoCmd 0 :\n" + \ .. " DoCmd + customlist,SomeFunc :ls\n" \ .. "\tLast set from .*/test_usercommands.vim line \\d\\+$", \ execute('verbose command DoCmd')) diff --git a/src/usercmd.c b/src/usercmd.c index 70f45aab8..808d36c41 100644 --- a/src/usercmd.c +++ b/src/usercmd.c @@ -548,6 +548,13 @@ uc_list(char_u *name, size_t name_len) { STRCPY(IObuff + len, command_complete[j].name); len += (int)STRLEN(IObuff + len); + if (p_verbose > 0 && cmd->uc_compl_arg != NULL + && STRLEN(cmd->uc_compl_arg) < 200) + { + IObuff[len] = ','; + STRCPY(IObuff + len + 1, cmd->uc_compl_arg); + len += (int)STRLEN(IObuff + len); + } break; } diff --git a/src/version.c b/src/version.c index bc7552248..bee41fded 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4122, /**/ 4121, /**/