patch 8.1.2322: quickfix test fails in very big terminal
Problem: Quickfix test fails in very big terminal.
Solution: Adjust the expected result for the width. (Masato Nishihata,
closes #5244)
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index eec3bde..44f7aec 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -619,8 +619,15 @@
let w3 = win_getid()
call assert_true(&buftype == 'help')
call assert_true(winnr() == 1)
- call assert_equal(['col', [['leaf', w3],
- \ ['row', [['leaf', w2], ['leaf', w1]]]]], winlayout())
+ " See jump_to_help_window() for details
+ let w2_width = winwidth(w2)
+ if w2_width != &columns && w2_width < 80
+ call assert_equal(['col', [['leaf', w3],
+ \ ['row', [['leaf', w2], ['leaf', w1]]]]], winlayout())
+ else
+ call assert_equal(['row', [['col', [['leaf', w3], ['leaf', w2]]],
+ \ ['leaf', w1]]] , winlayout())
+ endif
new | only
set buftype=help
diff --git a/src/version.c b/src/version.c
index f512b08..fc61f42 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2322,
+/**/
2321,
/**/
2320,