aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2021-03-22 23:10:00 +0100
committerMatthieu Coudron <mcoudron@hotmail.com>2021-03-22 23:33:17 +0100
commitf2e1709d49083093f734a3d01cd0202a3444ac60 (patch)
treec31c76d71a7145d7a2095c0cf97cdbb7270ee057 /src
parent1df1098b0c54258a41c4f97c9d3131d061a5b206 (diff)
downloadrneovim-f2e1709d49083093f734a3d01cd0202a3444ac60.tar.gz
rneovim-f2e1709d49083093f734a3d01cd0202a3444ac60.tar.bz2
rneovim-f2e1709d49083093f734a3d01cd0202a3444ac60.zip
fix: stop using CursorLineNr in front of fillers
filling lines in diff mode.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/screen.c3
1 files changed, 2 insertions, 1 deletions
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