patch 9.1.0357: Page scrolling should place cursor at window boundaries

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>

diff --git a/src/move.c b/src/move.c
index a234fca1d2146f85f227605b2411372dc26b714c..1b6e003cc0c2ad19a07a2069b94d472a5185b463 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -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();

diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 7fb6a4bf530986960d950128206e8a1afa963e5c..4b7e5e61421e6c0c85fd03de50a111038764adc4 100644 (file)
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -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

diff --git a/src/version.c b/src/version.c
index 593ac4914afd1830a168e5a277ffda6f85def4ae..93798aa020caff300ac68e19b920d61fdc10481e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    357,
 /**/
     356,
 /**/