diff --git a/src/move.c b/src/move.c
index 120ee5a..e9a3eb9 100644
--- a/src/move.c
+++ b/src/move.c
@@ -145,21 +145,25 @@
 # endif
 	    )
     {
-#ifdef FEAT_SYN_HL
-	if (!wp->w_p_rnu && 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);
-	    redrawWinline(wp, wp->w_cursor.lnum, FALSE);
+	if (wp->w_p_rnu)
+	    // win_line() will redraw the number column only.
 	    redraw_win_later(wp, VALID);
-	}
-	else
-#endif
-	    redraw_win_later(wp, SOME_VALID);
 #ifdef FEAT_SYN_HL
-	last_cursorline = wp->w_cursor.lnum;
+	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);
+		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;
+	}
 #endif
     }
 }