aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 9.1.0357: Page scrolling should place cursor at window boundaries

Browse Source 
Problem:  Page scrolling does not always place the cursor at the top or
          bottom of the window (Mathias Rav)
Solution: Place the cursor at the top or bottom of the window.
          (Luuk van Baal)

fixes: #14585
closes: #14586

Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Luuk van Baal 2024-04-20 17:38:20 +02:00 committed by Christian Brabandt
parent 59356019eb
commit 4b6b0c4024
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/move.c
View File

@ -3244,17 +3244,6 @@ pagescroll(int dir, long count, int half)
cursor_down_inner(curwin, curscount);
else
cursor_up_inner(curwin, curscount);
if (get_scrolloff_value() > 0)
cursor_correct();
#ifdef FEAT_FOLDING
// Move cursor to first line of closed fold.
foldAdjustCursor();
#endif
nochange = nochange
&& prev_col == curwin->w_cursor.col
&& prev_lnum == curwin->w_cursor.lnum;
}
else
{
@ -3262,8 +3251,23 @@ pagescroll(int dir, long count, int half)
count *= ((ONE_WINDOW && p_window > 0 && p_window < Rows - 1) ?
MAX(1, p_window - 2) : get_scroll_overlap(dir));
nochange = scroll_with_sms(dir, count);
// Place cursor at top or bottom of window.
validate_botline();
curwin->w_cursor.lnum = (dir == FORWARD ? curwin->w_topline
: curwin->w_botline - 1);
}
if (get_scrolloff_value() > 0)
cursor_correct();
#ifdef FEAT_FOLDING
// Move cursor to first line of closed fold.
foldAdjustCursor();
#endif
nochange = nochange
&& prev_col == curwin->w_cursor.col
&& prev_lnum == curwin->w_cursor.lnum;
// Error if both the viewport and cursor did not change.
if (nochange)
beep_flush();

17
src/testdir/test_normal.vim
View File

@ -3813,8 +3813,8 @@ func Test_normal_vert_scroll_longline()
call assert_equal(11, line('.'))
call assert_equal(1, winline())
exe "normal \<C-B>"
call assert_equal(10, line('.'))
call assert_equal(4, winline())
call assert_equal(11, line('.'))
call assert_equal(5, winline())
exe "normal \<C-B>\<C-B>"
call assert_equal(5, line('.'))
call assert_equal(5, winline())
@ -4247,4 +4247,17 @@ func Test_halfpage_cursor_startend()
bwipe!
endfunc
" Test for Ctrl-F/B moving the cursor to the window boundaries.
func Test_page_cursor_topbot()
10new
call setline(1, range(1, 100))
exe "norm! gg2\<C-F>"
call assert_equal(17, line('.'))
exe "norm! \<C-B>"
call assert_equal(18, line('.'))
exe "norm! \<C-B>\<C-F>"
call assert_equal(9, line('.'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
357,
/**/
356,
/**/