Mercurial > vim
changeset 32282:e47739c49487 v9.0.1472
patch 9.0.1472: ":drop fname" may change the last used tab page
Commit: https://github.com/vim/vim/commit/8281a16efc76197f7b0b2a385dffb44fce66d33e
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 20 18:07:57 2023 +0100
patch 9.0.1472: ":drop fname" may change the last used tab page
Problem: ":drop fname" may change the last used tab page.
Solution: Restore the last used tab page when :drop has changed it.
(closes #12087)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 20 Apr 2023 19:15:04 +0200 |
| parents | 66e6a2f7c00b |
| children | 9d584852b1af |
| files | src/arglist.c src/testdir/test_tabpage.vim src/version.c |
| diffstat | 3 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/arglist.c +++ b/src/arglist.c @@ -1240,6 +1240,8 @@ do_arg_all( need_mouse_correct = TRUE; #endif + tabpage_T *new_lu_tp = curtab; + // Try closing all windows that are not in the argument list. // Also close windows that are not full width; // When 'hidden' or "forceit" set the buffer becomes hidden. @@ -1247,6 +1249,10 @@ do_arg_all( // When the ":tab" modifier was used do this for all tab pages. arg_all_close_unused_windows(&aall); + // Now set the last used tabpage to where we started. + if (valid_tabpage(new_lu_tp)) + lastused_tabpage = new_lu_tp; + // Open a window for files in the argument list that don't have one. // ARGCOUNT may change while doing this, because of autocommands. if (count > aall.opened_len || count <= 0)
--- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -150,6 +150,22 @@ function Test_tabpage() tabonly! endfunc +func Test_tabpage_drop() + edit f1 + tab split f2 + tab split f3 + normal! gt + call assert_equal(1, tabpagenr()) + + tab drop f3 + call assert_equal(3, tabpagenr()) + call assert_equal(1, tabpagenr('#')) + bwipe! + bwipe! + bwipe! + call assert_equal(1, tabpagenr('$')) +endfunc + " Test autocommands function Test_tabpage_with_autocmd() command -nargs=1 -bar C :call add(s:li, '=== ' . <q-args> . ' ===')|<args>