diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-05 22:51:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-05 22:51:13 +0200 |
| commit | 7ab6defcafe017a3ad58580a3e56dab705b1ed8b (patch) | |
| tree | cbb3ca004311c7e7ed9aced83886e3804eac9035 | |
| parent | 7dc5e2e486fe0287601968e535902a41a39f65bb (diff) | |
patch 7.4.2161v7.4.2161
Problem: Expression test fails without conceal feature.
Solution: Only check "conceal" with the conceal feature.
| -rw-r--r-- | src/testdir/test_expr.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim index 557d74960f..cd71c419a1 100644 --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -198,8 +198,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/version.c b/src/version.c index 94e14bff86..e68df1f5ac 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2161, +/**/ 2160, /**/ 2159, |