# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1470430807 -7200
# Node ID 5602912113039d0f1a725bfac7bf856077469e02
# Parent  a8138a3ee54d30502beada21da0beaf31ad05282
commit https://github.com/vim/vim/commit/7ab6defcafe017a3ad58580a3e56dab705b1ed8b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Aug 5 22:51:13 2016 +0200

    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
--- 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
--- 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,