diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-12-01 17:48:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-12-01 17:48:29 +0100 |
| commit | 5a030a540f4157d5c9905e3564282c92b4dcec9a (patch) | |
| tree | aed80b43f0c4fed9445a8a8a11d2896e57c8977b | |
| parent | b129a447f3b580d4c941869672b0557c52c37e4d (diff) | |
patch 8.0.0110v8.0.0110
Problem: Drop command doesn't use existing window.
Solution: Check the window width properly. (Hirohito Higashi)
| -rw-r--r-- | src/buffer.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_tabpage.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index e5d2dde255..e77fc04976 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4858,8 +4858,8 @@ do_arg_all( wpnext = wp->w_next; buf = wp->w_buffer; if (buf->b_ffname == NULL - || (!keep_tabs && buf->b_nwindows > 1) - || wp->w_width != Columns) + || (!keep_tabs && (buf->b_nwindows > 1 + || wp->w_width != Columns))) i = opened_len; else { diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 3f69fb9193..1720107458 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -65,6 +65,15 @@ function Test_tabpage() call assert_true(tabpagenr() == 2 && tabpagewinnr(2, '$') == 2 && tabpagewinnr(2) == 1) tabclose q + " + " + " Test for ":tab drop vertical-split-window" to jump test1 buffer + tabedit test1 + vnew + tabfirst + tab drop test1 + call assert_equal([2, 2, 2, 2], [tabpagenr('$'), tabpagenr(), tabpagewinnr(2, '$'), tabpagewinnr(2)]) + 1tabonly endif " " diff --git a/src/version.c b/src/version.c index e234f86ab8..c9fc5727df 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 110, +/**/ 109, /**/ 108, |