aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-03-21 10:12:02 -0400
committerGitHub <noreply@github.com>2017-03-21 10:12:02 -0400
commit5657bb9ea6dfdf799f4d46d8e9022bd7382765e7 (patch)
tree61998f62ba15b9aa29da7c053bdbf67c6809ea1a
parent2611ba8abb19a3b1f910d4c29eed5039a819e712 (diff)
parent7418adc14375161b504e78c77c5c4e532016902c (diff)
downloadrneovim-5657bb9ea6dfdf799f4d46d8e9022bd7382765e7.tar.gz
rneovim-5657bb9ea6dfdf799f4d46d8e9022bd7382765e7.tar.bz2
rneovim-5657bb9ea6dfdf799f4d46d8e9022bd7382765e7.zip
Merge pull request #6327 from lonerover/issue-#6319
[RFC] fix the behavior of CTRL-F with 'scrolloff' (#6319)
-rw-r--r--src/nvim/move.c1
-rw-r--r--src/nvim/testdir/test_normal.vim1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 4c3f82bc16..4feabf624b 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -1877,6 +1877,7 @@ int onepage(int dir, long count)
}
}
foldAdjustCursor();
+ cursor_correct();
check_cursor_col();
if (retval == OK) {
beginline(BL_SOL | BL_FIX);
diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim
index 29a7c1edd8..a22dca35cc 100644
--- a/src/nvim/testdir/test_normal.vim
+++ b/src/nvim/testdir/test_normal.vim
@@ -433,7 +433,6 @@ func! Test_normal13_help()
endfunc
func! Test_normal14_page()
- throw "skipped: Nvim regression: CTRL-F with 'scrolloff'"
" basic test for Ctrl-F and Ctrl-B
call Setup_NewWindow()
exe "norm! \<c-f>"