diff options
| -rw-r--r-- | src/testdir/test_edit.vim | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index dddffa389..8c4d9f222 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -1213,20 +1213,28 @@ func Test_edit_MOUSE() 10new call setline(1, range(1, 100)) call cursor(1, 1) + call assert_equal(1, line('w0')) + call assert_equal(10, line('w$')) set mouse=a + " One scroll event moves three lines. call feedkeys("A\<ScrollWheelDown>\<esc>", 'tnix') - call assert_equal([0, 4, 1, 0], getpos('.')) - " This should move by one pageDown, but only moves - " by one line when the test is run... + call assert_equal(4, line('w0')) + call assert_equal(13, line('w$')) + " This should move by one page down. call feedkeys("A\<S-ScrollWheelDown>\<esc>", 'tnix') - call assert_equal([0, 5, 1, 0], getpos('.')) + call assert_equal(14, line('w0')) set nostartofline + " Another page down. call feedkeys("A\<C-ScrollWheelDown>\<esc>", 'tnix') - call assert_equal([0, 6, 1, 0], getpos('.')) + call assert_equal(24, line('w0')) + + call assert_equal([0, 24, 2, 0], getpos('.')) + call test_setmouse(4, 3) call feedkeys("A\<LeftMouse>\<esc>", 'tnix') - call assert_equal([0, 6, 1, 0], getpos('.')) - call feedkeys("A\<RightMouse>\<esc>", 'tnix') - call assert_equal([0, 6, 1, 0], getpos('.')) + call assert_equal([0, 27, 2, 0], getpos('.')) + call test_setmouse(5, 3) + call feedkeys("A\<RightMouse>\<esc>\<esc>", 'tnix') + call assert_equal([0, 28, 2, 0], getpos('.')) call cursor(1, 100) norm! zt " this should move by a screen up, but when the test diff --git a/src/version.c b/src/version.c index 0fda34805..4e7a33564 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4916, +/**/ 4915, /**/ 4914, |