changeset 18660:4d2a88cc5821 v8.1.2322

patch 8.1.2322: quickfix test fails in very big terminal Commit: https://github.com/vim/vim/commit/ffc4fb8fee4521a86670ae791411e319b6a2e1fd Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 19 22:38:48 2019 +0100 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)
author Bram Moolenaar <Bram@vim.org>
date Tue, 19 Nov 2019 22:45:04 +0100
parents c68c1e19acfa
children 13331e05a1c8
files src/testdir/test_quickfix.vim src/version.c
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2322,
+/**/
     2321,
 /**/
     2320,