summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-01 14:31:34 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-01 14:31:34 +0100
commit5efe0e5d16db070f0ab0b944686139e597afe166 (patch)
tree56a348e15e7b699371f84da3fc4c4f33fae654e5
parenta387083b2f65c2c14b19087c7d7f94ca23de1d48 (diff)
downloadvim-git-8.2.2260.tar.gz
patch 8.2.2260: window resize test fails in very wide terminalv8.2.2260
Problem: Window resize test fails in very wide terminal. Solution: Resize using the 'columns' option. (Vladimir Lomov, closes #7592)
-rw-r--r--src/testdir/test_window_cmd.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index b0c5a417e..8a9748849 100644
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -1154,7 +1154,7 @@ func Test_window_resize()
wincmd l
let other_winnr = winnr('h')
call assert_notequal(winnr(), other_winnr)
- exe 'vert ' .. other_winnr .. 'resize -100'
+ exe 'vert ' .. other_winnr .. 'resize -' .. &columns
call assert_equal(0, winwidth(other_winnr))
%bwipe!
diff --git a/src/version.c b/src/version.c
index 5ebda4692..a1b32e853 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2260,
+/**/
2259,
/**/
2258,