From f2e1709d49083093f734a3d01cd0202a3444ac60 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Mon, 22 Mar 2021 23:10:00 +0100
Subject: fix: stop using CursorLineNr in front of fillers

filling lines in diff mode.
---
 src/nvim/screen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/nvim/screen.c')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index d50520f49e..0334a808f4 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2758,7 +2758,8 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
               // :sign defined with "numhl" highlight.
               char_attr = sign_get_attr(num_sign, SIGN_NUMHL);
             } else if ((wp->w_p_cul || wp->w_p_rnu)
-                       && lnum == wp->w_cursor.lnum) {
+                       && lnum == wp->w_cursor.lnum
+                       && filler_todo == 0) {
               // When 'cursorline' is set highlight the line number of
               // the current line differently.
               // TODO(vim): Can we use CursorLine instead of CursorLineNr
-- 
cgit