diff options
| -rw-r--r-- | src/testdir/test_gui.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 809dd3579c..1cf2b0f475 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -733,12 +733,15 @@ func Test_scrollbars() call assert_equal(1, winline()) call assert_equal(11, line('.')) - " scroll to move line 1 at top, cursor stays in line 11 - let args = #{which: 'right', value: 0, dragging: 0} - call test_gui_event('scrollbar', args) - redraw - call assert_equal(11, winline()) - call assert_equal(11, line('.')) + " FIXME: This test should also pass with Motif and 24 lines + if &lines > 24 || !has('gui_motif') + " scroll to move line 1 at top, cursor stays in line 11 + let args = #{which: 'right', value: 0, dragging: 0} + call test_gui_event('scrollbar', args) + redraw + call assert_equal(11, winline()) + call assert_equal(11, line('.')) + endif set nowrap call setline(11, repeat('x', 150)) diff --git a/src/version.c b/src/version.c index ca6d79245f..10e01447f1 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1566, +/**/ 1565, /**/ 1564, |