diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-19 22:38:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-19 22:38:48 +0100 |
| commit | ffc4fb8fee4521a86670ae791411e319b6a2e1fd (patch) | |
| tree | 79e9e4eacafdf4a6fb0368940a0d3a5a8c888770 | |
| parent | 0a5aa7b28a39507260acb15c1ef698a33c855cc1 (diff) | |
| download | vim-git-8.1.2322.tar.gz | |
patch 8.1.2322: quickfix test fails in very big terminalv8.1.2322
Problem: Quickfix test fails in very big terminal.
Solution: Adjust the expected result for the width. (Masato Nishihata,
closes #5244)
| -rw-r--r-- | src/testdir/test_quickfix.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index eec3bde17..44f7aecea 100644 --- 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 f512b0870..fc61f42e0 100644 --- 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, |