mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-21 17:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20718 from neovim/backport-20716-to-release-0.8

Browse Source 
[Backport release-0.8] vim-patch:9.0.0786: user command does not get number from :tab modifier
This commit is contained in:
zeertzjq
2022-10-18 21:49:37 +08:00
committed by GitHub
parent 6fe00190f0 24769cf1b5
commit 9234e5acd6
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/testdir/test_usercommands.vim
View File

@@ -79,6 +79,19 @@ function Test_cmdmods()
call assert_equal('silent!', g:mods)
tab MyCmd
call assert_equal('tab', g:mods)
0tab MyCmd
call assert_equal('0tab', g:mods)
tab split
tab MyCmd
call assert_equal('tab', g:mods)
1tab MyCmd
call assert_equal('1tab', g:mods)
tabprev
tab MyCmd
call assert_equal('tab', g:mods)
2tab MyCmd
call assert_equal('2tab', g:mods)
2tabclose
topleft MyCmd
call assert_equal('topleft', g:mods)
to MyCmd

14
src/nvim/usercmd.c
View File

@@ -1237,8 +1237,18 @@ size_t add_win_cmd_modifers(char *buf, const cmdmod_T *cmod, bool *multi_mods)
// :tab
if (cmod->cmod_tab > 0) {
result += add_cmd_modifier(buf, "tab", multi_mods);
int tabnr = cmod->cmod_tab - 1;
if (tabnr == tabpage_index(curtab)) {
// For compatibility, don't add a tabpage number if it is the same
// as the default number for :tab.
result += add_cmd_modifier(buf, "tab", multi_mods);
} else {
char tab_buf[NUMBUFLEN + 3];
snprintf(tab_buf, sizeof(tab_buf), "%dtab", tabnr);
result += add_cmd_modifier(buf, tab_buf, multi_mods);
}
}
// :topleft
if (cmod->cmod_split & WSP_TOP) {
result += add_cmd_modifier(buf, "topleft", multi_mods);
@@ -1308,7 +1318,7 @@ size_t uc_mods(char *buf, const cmdmod_T *cmod, bool quote)
result += add_cmd_modifier(buf, "verbose", &multi_mods);
} else {
char verbose_buf[NUMBUFLEN];
snprintf(verbose_buf, NUMBUFLEN, "%dverbose", verbose_value);
snprintf(verbose_buf, sizeof(verbose_buf), "%dverbose", verbose_value);
result += add_cmd_modifier(buf, verbose_buf, &multi_mods);
}
}