Mercurial > vim
changeset 30904:8c7495056f35 v9.0.0786
patch 9.0.0786: user command does not get number from :tab modifier
Commit: https://github.com/vim/vim/commit/208567e9d744ef7b89bed1f62e951ae4ee2f6f5f
Author: zeertzjq <zeertzjq@outlook.com>
Date: Tue Oct 18 13:11:21 2022 +0100
patch 9.0.0786: user command does not get number from :tab modifier
Problem: User command does not get number from :tab modifier.
Solution: Include the number. (closes https://github.com/vim/vim/issues/11393, closes https://github.com/vim/vim/issues/6801)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 18 Oct 2022 14:15:08 +0200 |
| parents | 82279571d16f |
| children | 73b169b2dabd |
| files | src/testdir/test_usercommands.vim src/usercmd.c src/version.c |
| diffstat | 3 files changed, 33 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_usercommands.vim +++ b/src/testdir/test_usercommands.vim @@ -81,6 +81,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
--- a/src/usercmd.c +++ b/src/usercmd.c @@ -1436,7 +1436,24 @@ add_win_cmd_modifers(char_u *buf, cmdmod // :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]; + + sprintf(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);