diff options
| author | KunMing Xie <qqzz014@gmail.com> | 2017-07-23 00:59:14 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-07-22 18:59:14 +0200 |
| commit | 962e8cc1dd4d1b901b249e8434ac4db6554d3e05 (patch) | |
| tree | de2f7b37a89e79720e3c4294c6e71b0c18de5b3f /src | |
| parent | 4bcc70b2b5b02e3a6048b55a4390739570db3524 (diff) | |
| download | rneovim-962e8cc1dd4d1b901b249e8434ac4db6554d3e05.tar.gz rneovim-962e8cc1dd4d1b901b249e8434ac4db6554d3e05.tar.bz2 rneovim-962e8cc1dd4d1b901b249e8434ac4db6554d3e05.zip | |
vim-patch:8.0.0052 (#7057)
Problem: Conceal test passes even without the bug fix.
Solution: Add a redraw command. (Christian Brabandt)
https://github.com/vim/vim/commit/35a1f59d635d9a655e1267c18f7cc757afd0d5b0
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_matchadd_conceal.vim | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_matchadd_conceal.vim b/src/nvim/testdir/test_matchadd_conceal.vim index c788689e33..c11f1a84a9 100644 --- a/src/nvim/testdir/test_matchadd_conceal.vim +++ b/src/nvim/testdir/test_matchadd_conceal.vim @@ -277,6 +277,7 @@ function! Test_matchadd_and_syn_conceal() call assert_notequal(screenattr(1, 11) , screenattr(1, 12)) call assert_equal(screenattr(1, 11) , screenattr(1, 32)) call matchadd('CheckedByCoq', '\%<2l\%>9c\%<16c') + redraw! call assert_equal(expect, s:screenline(1)) call assert_notequal(screenattr(1, 10) , screenattr(1, 11)) call assert_notequal(screenattr(1, 11) , screenattr(1, 12)) diff --git a/src/nvim/version.c b/src/nvim/version.c index 9b5c5eefb8..b325052cd2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -677,7 +677,7 @@ static const int included_patches[] = { // 55 NA // 54 NA 53, - // 52, + 52, // 51 NA // 50 NA 49, |