patch 8.2.2260: window resize test fails in very wide terminal

Problem:    Window resize test fails in very wide terminal.
Solution:   Resize using the 'columns' option.  (Vladimir Lomov, closes #7592)

diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index b0c5a417e61bd32a891f31577b122dfbe9ee88af..8a97488497ba0ac2a91967176d51e412ed557e11 100644 (file)
--- 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 5ebda4692b3e971adbf9242e82017c6dd4a85f0b..a1b32e853fe861cf9fb99501ab0be0257a398249 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2260,
 /**/
     2259,
 /**/