1 files changed, 7 insertions, 9 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 442e5d6dff..320f7b7d98 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -96,11 +96,9 @@ static void comp_botline(win_T *wp)
   set_empty_rows(wp, done);
 }
 
-static linenr_T last_cursorline = 0;
-
 void reset_cursorline(void)
 {
-  last_cursorline = 0;
+  curwin->w_last_cursorline = 0;
 }
 
 // Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is set.
@@ -114,17 +112,17 @@ static void redraw_for_cursorline(win_T *wp)
       redraw_win_later(wp, VALID);
     }
     if (wp->w_p_cul) {
-      if (wp->w_redr_type <= VALID && last_cursorline != 0) {
-        // "last_cursorline" may be set for another window, worst case
-        // we redraw too much.  This is optimized for moving the cursor
-        // around in the same window.
-        redrawWinline(wp, last_cursorline, false);
+      if (wp->w_redr_type <= VALID && wp->w_last_cursorline != 0) {
+        // "w_last_cursorline" may be outdated, worst case we redraw
+        // too much.  This is optimized for moving the cursor around in
+        // the current window.
+        redrawWinline(wp, wp->w_last_cursorline, false);
         redrawWinline(wp, wp->w_cursor.lnum, false);
         redraw_win_later(wp, VALID);
       } else {
         redraw_win_later(wp, SOME_VALID);
       }
-      last_cursorline = wp->w_cursor.lnum;
+      wp->w_last_cursorline = wp->w_cursor.lnum;
     }
   }
 }