From 7ab6defcafe017a3ad58580a3e56dab705b1ed8b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 5 Aug 2016 22:51:13 +0200 Subject: [PATCH] patch 7.4.2161 Problem: Expression test fails without conceal feature. Solution: Only check "conceal" with the conceal feature. --- src/testdir/test_expr.vim | 8 ++++++-- 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 557d74960..cd71c419a 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 94e14bff8..e68df1f5a 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2161, /**/ 2160, /**/ -- 2.50.1