diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-08-02 19:23:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 19:23:57 -0400 |
| commit | 8baf7bce2b51e8d3d47b6c70ce054663d927639a (patch) | |
| tree | ca10917fd84e011306b3303829704232b7f2f682 /test | |
| parent | 93443d59a9680a6055d4602653d34516bc2c2571 (diff) | |
| parent | c24daf5a1013c629f82ba8d4a4de885d7986d982 (diff) | |
| download | rneovim-8baf7bce2b51e8d3d47b6c70ce054663d927639a.tar.gz rneovim-8baf7bce2b51e8d3d47b6c70ce054663d927639a.tar.bz2 rneovim-8baf7bce2b51e8d3d47b6c70ce054663d927639a.zip | |
Merge pull request #15226 from zeertzjq/vim-8.1.2029
vim-patch:8.1.2029,8.1.2117,8.1.2214,8.2.3204
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/ui/diff_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/ui/fold_spec.lua | 2 |
2 files changed, 3 insertions, 3 deletions
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') |