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 eec3bde17f6ad55b9a7c35dc00c8f4f7050da1e3..44f7aeceaed1829f61594f86334680b884af333a 100644 (file)
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -619,8 +619,15 @@ func s:test_xhelpgrep(cchar)
   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 f512b087006e922663b50324e54282ee01f7089d..fc61f42e06550a8801a17a925aec4f336af408d7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2322,
 /**/
     2321,
 /**/