diff options
| author | raichoo <raichoo@googlemail.com> | 2017-03-22 21:57:20 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-22 21:57:20 +0100 |
| commit | 44e75eba30682007dd17f9a80805a9925a921976 (patch) | |
| tree | 8c8e9967ce159af621f72b7569953ed5598c6868 /src | |
| parent | f7aa1bfde6bc3600e4914cf38c777ff7f1ea56ab (diff) | |
| download | rneovim-44e75eba30682007dd17f9a80805a9925a921976.tar.gz rneovim-44e75eba30682007dd17f9a80805a9925a921976.tar.bz2 rneovim-44e75eba30682007dd17f9a80805a9925a921976.zip | |
vim-patch:7.4.2161 (#6340)
Problem: Expression test fails without conceal feature.
Solution: Only check "conceal" with the conceal feature.
https://github.com/vim/vim/commit/7ab6defcafe017a3ad58580a3e56dab705b1ed8b
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_expr.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_expr.vim b/src/nvim/testdir/test_expr.vim index ccbdde8244..2541d38d12 100644 --- a/src/nvim/testdir/test_expr.vim +++ b/src/nvim/testdir/test_expr.vim @@ -101,8 +101,12 @@ endfunc func Test_setmatches() hi def link 1 Comment hi def link 2 PreProc - let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4, "conceal": 5}] - let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4, "conceal": '5'}] + let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4}] + let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4}] + if has('conceal') + let set[0]['conceal'] = 5 + let exp[0]['conceal'] = '5' + endif call setmatches(set) call assert_equal(exp, getmatches()) endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index 398a3e6542..cbb7902985 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -280,7 +280,7 @@ static int included_patches[] = { 2164, 2163, 2162, - // 2161, + 2161, 2160, 2159, 2158, |