Merge pull request #27388 from zeertzjq/vim-9.1.0082

vim-patch:9.1.{0082,0083}: redrawing can be improved

2 files changed, 15 insertions, 19 deletions

diff --git a/src/nvim/change.c b/src/nvim/change.c
index fa098a3220..e0b5822233 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -353,20 +353,19 @@ static void changed_common(buf_T *buf, linenr_T lnum, colnr_T col, linenr_T lnum
       }
 
       // If lines have been added or removed, relative numbering always
-      // requires a redraw.
+      // requires an update even if cursor didn't move.
       if (wp->w_p_rnu && xtra != 0) {
         wp->w_last_cursor_lnum_rnu = 0;
-        redraw_later(wp, UPD_VALID);
       }
 
-      // Cursor line highlighting probably need to be updated with
-      // "UPD_VALID" if it's below the change.
-      // If the cursor line is inside the change we need to redraw more.
-      if (wp->w_p_cul) {
-        if (xtra == 0) {
-          redraw_later(wp, UPD_VALID);
-        } else if (lnum <= wp->w_last_cursorline) {
-          redraw_later(wp, UPD_SOME_VALID);
+      if (wp->w_p_cul && wp->w_last_cursorline >= lnum) {
+        if (wp->w_last_cursorline < lnume) {
+          // If 'cursorline' was inside the change, it has already
+          // been invalidated in w_lines[] by the loop above.
+          wp->w_last_cursorline = 0;
+        } else {
+          // If 'cursorline' was below the change, adjust its lnum.
+          wp->w_last_cursorline += xtra;
         }
       }
     }
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index f23c0a0fd3..3d048d178e 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -1643,12 +1643,6 @@ static void win_update(win_T *wp)
         top_end = 1;
       }
     }
-
-    // When line numbers are displayed need to redraw all lines below
-    // inserted/deleted lines.
-    if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) {
-      mod_bot = MAXLNUM;
-    }
   }
 
   wp->w_redraw_top = 0;  // reset for next time
@@ -2326,9 +2320,12 @@ static void win_update(win_T *wp)
       idx++;
       lnum += foldinfo.fi_lines + 1;
     } else {
-      if (wp->w_p_rnu && wp->w_last_cursor_lnum_rnu != wp->w_cursor.lnum) {
-        // 'relativenumber' set and cursor moved vertically: The
-        // text doesn't need to be drawn, but the number column does.
+      // If:
+      // - 'number' is set and below inserted/deleted lines, or
+      // - 'relativenumber' is set and cursor moved vertically,
+      // the text doesn't need to be redrawn, but the number column does.
+      if ((wp->w_p_nu && mod_top != 0 && lnum >= mod_bot && buf->b_mod_xlines != 0)
+          || (wp->w_p_rnu && wp->w_last_cursor_lnum_rnu != wp->w_cursor.lnum)) {
         foldinfo_T info = wp->w_p_cul && lnum == wp->w_cursor.lnum
                           ? cursorline_fi : fold_info(wp, lnum);
         win_line(wp, lnum, srow, wp->w_grid.rows, wp->w_lines[idx].wl_size, &spv, info);