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 557d749..cd71c41 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -198,8 +198,12 @@
 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 94e14bf..e68df1f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2161,
+/**/
     2160,
 /**/
     2159,