From 832857ae094743bd17e36a0096d1da38fc383178 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Tue, 9 Apr 2024 21:41:54 +0200
Subject: vim-patch:9.1.0285: Still problems with cursor position for CTRL-D/U

Problem:  Problems with cursor position when scrolling half a page.
Solution: Rework the cursor logic. (Luuk van Baal)

https://github.com/vim/vim/commit/78c51500f1bb16501521d721d52cb0982f5e70b6
---
 src/nvim/move.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/nvim/move.c b/src/nvim/move.c
index 675f048d09..f3a79c08bf 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -2424,7 +2424,6 @@ static bool scroll_with_sms(Direction dir, int count)
     if (labs(curwin->w_topline - prev_topline) > (dir == BACKWARD)) {
       fixdir = dir * -1;
     }
-    validate_cursor(curwin);
     while (curwin->w_skipcol > 0
            && curwin->w_topline < curbuf->b_ml.ml_line_count) {
       scroll_redraw(fixdir == FORWARD, 1);
@@ -2447,6 +2446,7 @@ int pagescroll(Direction dir, int count, bool half)
   int nochange = true;
   int buflen = curbuf->b_ml.ml_line_count;
   colnr_T prev_col = curwin->w_cursor.col;
+  colnr_T prev_curswant = curwin->w_curswant;
   linenr_T prev_lnum = curwin->w_cursor.lnum;
   oparg_T oa = { 0 };
   cmdarg_T ca = { 0 };
@@ -2471,32 +2471,24 @@ int pagescroll(Direction dir, int count, bool half)
       }
     }
 
-    // Scroll the window and determine number of lines to move the cursor.
+    // (Try to) scroll the window unless already at the end of the buffer.
     if (count > 0) {
-      validate_cursor(curwin);
-      int prev_wrow = curwin->w_wrow;
       nochange = scroll_with_sms(dir, count);
-      if (!nochange) {
-        validate_cursor(curwin);
-        curscount = abs(prev_wrow - curwin->w_wrow);
-        dir = prev_wrow > curwin->w_wrow ? FORWARD : BACKWARD;
-      }
+      curwin->w_cursor.lnum = prev_lnum;
+      curwin->w_cursor.col = prev_col;
+      curwin->w_curswant = prev_curswant;
     }
 
-    int so = get_scrolloff_value(curwin);
-    // Move the cursor the same amount of screen lines except if
-    // 'scrolloff' is set and cursor was at start or end of buffer.
-    if (so == 0 || (prev_lnum != 1 && prev_lnum != buflen)) {
-      if (curwin->w_p_wrap) {
-        nv_screengo(&oa, dir, curscount);
-      } else if (dir == FORWARD) {
-        cursor_down_inner(curwin, curscount);
-      } else {
-        cursor_up_inner(curwin, curscount);
-      }
+    // Move the cursor the same amount of screen lines.
+    if (curwin->w_p_wrap) {
+      nv_screengo(&oa, dir, curscount);
+    } else if (dir == FORWARD) {
+      cursor_down_inner(curwin, curscount);
+    } else {
+      cursor_up_inner(curwin, curscount);
     }
 
-    if (so > 0) {
+    if (get_scrolloff_value(curwin) > 0) {
       cursor_correct(curwin);
     }
     // Move cursor to first line of closed fold.
-- 
cgit 


From d4956e16d9e510b0f8aa9d65ef98ea36dfc5613d Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Tue, 9 Apr 2024 23:19:17 +0200
Subject: vim-patch:9.1.0294: Text height function does not respect it's
 argument

Problem:  plines_m_win() does not take into account it's "limit_winheight"
          argument for filler lines below the last line of the buffer.
          (after v9.1.0280)
Solution: Check window height when "limit_winheight" is TRUE.
          (Luuk van Baal)

https://github.com/vim/vim/commit/08b0f632c125514fe0ea188c36ac048d7d7929d4
---
 src/nvim/move.c   | 2 +-
 src/nvim/plines.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/nvim/move.c b/src/nvim/move.c
index f3a79c08bf..c055f6baad 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -2464,7 +2464,7 @@ int pagescroll(Direction dir, int count, bool half)
     if (dir == FORWARD) {
       int n = plines_correct_topline(curwin, curwin->w_topline, NULL, false, NULL);
       if (n - count < curwin->w_height_inner && curwin->w_topline < buflen) {
-        n += plines_m_win(curwin, curwin->w_topline + 1, buflen, true);
+        n += plines_m_win(curwin, curwin->w_topline + 1, buflen, false);
       }
       if (n - count < curwin->w_height_inner) {
         count = n - curwin->w_height_inner;
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index 8734780415..0c55e2fd72 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -880,14 +880,17 @@ int plines_m_win(win_T *wp, linenr_T first, linenr_T last, bool limit_winheight)
 {
   int count = 0;
 
-  while (first <= last) {
+  while (first <= last && (!limit_winheight || count < wp->w_height_inner)) {
     linenr_T next = first;
-    count += plines_win_full(wp, first, &next, NULL, false, limit_winheight);
+    count += plines_win_full(wp, first, &next, NULL, false, false);
     first = next + 1;
   }
   if (first == wp->w_buffer->b_ml.ml_line_count + 1) {
     count += win_get_fill(wp, first);
   }
+  if (limit_winheight && count > wp->w_height_inner) {
+    return wp->w_height_inner;
+  }
   return count;
 }
 
-- 
cgit