diff options
| -rw-r--r-- | src/arglist.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_tabpage.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/arglist.c b/src/arglist.c index 292af30a14..723133254a 100644 --- a/src/arglist.c +++ b/src/arglist.c @@ -1253,10 +1253,6 @@ 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) @@ -1291,6 +1287,11 @@ do_arg_all( // to window with first arg if (valid_tabpage(aall.new_curtab)) goto_tabpage_tp(aall.new_curtab, TRUE, TRUE); + + // Now set the last used tabpage to where we started. + if (valid_tabpage(new_lu_tp)) + lastused_tabpage = new_lu_tp; + if (win_valid(aall.new_curwin)) win_enter(aall.new_curwin, FALSE); diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 46aed221e4..94f695323f 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -156,10 +156,13 @@ func Test_tabpage_drop() tab split f3 normal! gt call assert_equal(1, tabpagenr()) + tab drop f4 + call assert_equal(1, tabpagenr('#')) tab drop f3 - call assert_equal(3, tabpagenr()) - call assert_equal(1, tabpagenr('#')) + call assert_equal(4, tabpagenr()) + call assert_equal(2, tabpagenr('#')) + bwipe! bwipe! bwipe! bwipe! diff --git a/src/version.c b/src/version.c index 8002c95b6d..08a78b6001 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 87, +/**/ 86, /**/ 85, |