diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-03-14 13:55:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 13:55:12 +0000 |
| commit | 2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e (patch) | |
| tree | 7da2a639663d6c46e57766b5e9cb70a6ccd63c39 /src/nvim/normal.c | |
| parent | 895ca52e4c726fd6c2cf6fbbab0d392818337ce7 (diff) | |
| parent | 365a9b074f2df3c573ae4a520084818bdd46cd3d (diff) | |
| download | rneovim-2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e.tar.gz rneovim-2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e.tar.bz2 rneovim-2fbbd3258ec90d37c3192a1f7a8ee2cd4db5653e.zip | |
Merge pull request #17488 from seandewar/vim-8.2.4428
vim-patch:8.2.{1401,1413,4428,4432,4434,4438,4442,4444,4445,4454}: tabpage patches
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 0e5e0ab403..f402865d2d 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -5869,7 +5869,7 @@ static void nv_gomark(cmdarg_T *cap) } } -// Handle CTRL-O, CTRL-I, "g;", "g,", and "CTRL-Tab" commands. +/// Handle CTRL-O, CTRL-I, "g;", "g,", and "CTRL-Tab" commands. static void nv_pcmark(cmdarg_T *cap) { pos_T *pos; @@ -5878,7 +5878,9 @@ static void nv_pcmark(cmdarg_T *cap) if (!checkclearopq(cap->oap)) { if (cap->cmdchar == TAB && mod_mask == MOD_MASK_CTRL) { - goto_tabpage_lastused(); + if (!goto_tabpage_lastused()) { + clearopbeep(cap->oap); + } return; } if (cap->cmdchar == 'g') { @@ -6642,9 +6644,10 @@ static void nv_g_cmd(cmdarg_T *cap) goto_tabpage(-(int)cap->count1); } break; + case TAB: - if (!checkclearop(oap)) { - goto_tabpage_lastused(); + if (!checkclearop(oap) && !goto_tabpage_lastused()) { + clearopbeep(oap); } break; |