diff options
| -rw-r--r-- | src/drawline.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_cursorline.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/drawline.c b/src/drawline.c index 43604c826..ea7764ea6 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -1113,11 +1113,11 @@ win_line( // the line number itself. // TODO: Can we use CursorLine instead of CursorLineNr // when CursorLineNr isn't set? - if ((wp->w_p_cul || wp->w_p_rnu) + if (wp->w_p_cul + && lnum == wp->w_cursor.lnum && (wp->w_p_culopt_flags & CULOPT_NBR) && (row == startrow - || wp->w_p_culopt_flags & CULOPT_LINE) - && lnum == wp->w_cursor.lnum) + || wp->w_p_culopt_flags & CULOPT_LINE)) char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); #endif } diff --git a/src/testdir/test_cursorline.vim b/src/testdir/test_cursorline.vim index 49df94f90..d4a03afd3 100644 --- a/src/testdir/test_cursorline.vim +++ b/src/testdir/test_cursorline.vim @@ -52,7 +52,7 @@ func Test_cursorline_highlight1() setl nocursorline relativenumber redraw let attr31 = s:screen_attr(1) - call assert_equal(attr21[0:3], attr31[0:3]) + call assert_equal(attr22[0:3], attr31[0:3]) call assert_equal(attr11[4:7], attr31[4:7]) call s:close_windows() diff --git a/src/version.c b/src/version.c index 11bfd6844..fa4930b7c 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2117, +/**/ 2116, /**/ 2115, |