mirror of
https://github.com/neovim/neovim
synced 2025-07-16 01:01:49 +00:00
vim-patch:9.1.0526: Unwanted cursor movement with pagescroll at start of buffer (#29569)
Problem: Cursor is moved to bottom of window trying to pagescroll when already at the start of the buffer (Asheq Imran, after v9.1.0357) Solution: Don't move cursor when buffer content did not move. (Luuk van Baal)8ccb89016e
(cherry picked from commit3e6cec0bef
)
This commit is contained in:
committed by
github-actions[bot]
parent
d6a73d7314
commit
f89d4ee6ce
@ -2520,9 +2520,11 @@ int pagescroll(Direction dir, int count, bool half)
|
||||
? MAX(1, (int)p_window - 2) : get_scroll_overlap(dir));
|
||||
nochange = scroll_with_sms(dir, count, &count);
|
||||
|
||||
// Place cursor at top or bottom of window.
|
||||
validate_botline(curwin);
|
||||
curwin->w_cursor.lnum = (dir == FORWARD ? curwin->w_topline : curwin->w_botline - 1);
|
||||
if (!nochange) {
|
||||
// Place cursor at top or bottom of window.
|
||||
validate_botline(curwin);
|
||||
curwin->w_cursor.lnum = (dir == FORWARD ? curwin->w_topline : curwin->w_botline - 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (get_scrolloff_value(curwin) > 0) {
|
||||
|
@ -4267,6 +4267,9 @@ func Test_page_cursor_topbot()
|
||||
call assert_equal(18, line('.'))
|
||||
exe "norm! \<C-B>\<C-F>"
|
||||
call assert_equal(9, line('.'))
|
||||
" Not when already at the start of the buffer.
|
||||
exe "norm! ggj\<C-B>"
|
||||
call assert_equal(2, line('.'))
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
|
Reference in New Issue
Block a user