patch 7.4.2161

Problem:    Expression test fails without conceal feature.
Solution:   Only check "conceal" with the conceal feature.

diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index 557d74960f7e3df6a276014c95fbd55e53eb8e83..cd71c419a1f8b7242c40365ef1f8eb18df47c939 100644 (file)
--- 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 94e14bff86553a555be8b0abf2f43e0b1526d502..e68df1f5aca36902d97175a422f6e7ff363e4c50 100644 (file)
--- 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,
 /**/