diff options
| -rw-r--r-- | src/nvim/move.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_normal.vim | 9 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 4c1b8a8411..9ba515f209 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -1877,7 +1877,7 @@ int onepage(int dir, long count) } } foldAdjustCursor(); - cursor_correct(); + check_cursor_col(); if (retval == OK) beginline(BL_SOL | BL_FIX); curwin->w_valid &= ~(VALID_WCOL|VALID_WROW|VALID_VIRTCOL); diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim index ff6710218d..98cb7754bb 100644 --- a/src/nvim/testdir/test_normal.vim +++ b/src/nvim/testdir/test_normal.vim @@ -398,6 +398,15 @@ func! Test_normal14_page() bw! endfu +func! Test_normal14_page_eol() + 10new + norm oxxxxxxx + exe "norm 2\<c-f>" + " check with valgrind that cursor is put back in column 1 + exe "norm 2\<c-b>" + bw! +endfunc + func! Test_normal15_z_scroll_vert() " basic test for z commands that scroll the window call Setup_NewWindow() diff --git a/src/nvim/version.c b/src/nvim/version.c index 207b561cc3..7f07e5a287 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -119,7 +119,7 @@ static int included_patches[] = { // 2325 NA // 2324, // 2323, - // 2322, + 2322, 2321, // 2320, // 2319 NA |