diff options
| -rw-r--r-- | src/nvim/screen.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cursorline.vim | 2 | ||||
| -rw-r--r-- | test/functional/ui/diff_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/ui/fold_spec.lua | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index dd9b889746..6fda44f5eb 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2809,11 +2809,11 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, if (num_sattr != NULL) { // :sign defined with "numhl" highlight. char_attr = num_sattr->sat_numhl; - } else if ((wp->w_p_cul || wp->w_p_rnu) + } else 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 && filler_todo == 0) { // When 'cursorline' is set highlight the line number of // the current line differently. diff --git a/src/nvim/testdir/test_cursorline.vim b/src/nvim/testdir/test_cursorline.vim index 49df94f906..d4a03afd38 100644 --- a/src/nvim/testdir/test_cursorline.vim +++ b/src/nvim/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/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua index a8d9fb02fc..6c6735a4cf 100644 --- a/test/functional/ui/diff_spec.lua +++ b/test/functional/ui/diff_spec.lua @@ -1057,7 +1057,7 @@ it('diff updates line numbers below filler lines', function() vnew call setline(1, ['a', 'a', 'a', 'x', 'x', 'x', 'b', 'b', 'b', 'b', 'b']) windo diffthis - setlocal number rnu foldcolumn=0 + setlocal number rnu cursorline cursorlineopt=number foldcolumn=0 ]]) screen:expect([[ {1: }a {3:│}{10:1 }^a | @@ -1109,7 +1109,7 @@ it('diff updates line numbers below filler lines', function() {3:[No Name] [+] }{7:[No Name] [+] }| | ]]) - command("set signcolumn number tgc cursorline") + command("set signcolumn number tgc cursorline cursorlineopt=number,line") command("hi CursorLineNr guibg=red") screen:expect{grid=[[ {1: }a {3:│}{11: 2 }a | diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua index 8883ad8270..249686234c 100644 --- a/test/functional/ui/fold_spec.lua +++ b/test/functional/ui/fold_spec.lua @@ -85,7 +85,7 @@ describe("folded lines", function() end) it("highlighting with relative line numbers", function() - command("set relativenumber foldmethod=marker") + command("set relativenumber cursorline cursorlineopt=number foldmethod=marker") feed_command("set foldcolumn=2") funcs.setline(1, '{{{1') funcs.setline(2, 'line 1') |