From 44e75eba30682007dd17f9a80805a9925a921976 Mon Sep 17 00:00:00 2001
From: raichoo <raichoo@googlemail.com>
Date: Wed, 22 Mar 2017 21:57:20 +0100
Subject: vim-patch:7.4.2161 (#6340)

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

https://github.com/vim/vim/commit/7ab6defcafe017a3ad58580a3e56dab705b1ed8b
---
 src/nvim/testdir/test_expr.vim | 8 ++++++--
 src/nvim/version.c             | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_expr.vim b/src/nvim/testdir/test_expr.vim
index ccbdde8244..2541d38d12 100644
--- a/src/nvim/testdir/test_expr.vim
+++ b/src/nvim/testdir/test_expr.vim
@@ -101,8 +101,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/nvim/version.c b/src/nvim/version.c
index 398a3e6542..cbb7902985 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -280,7 +280,7 @@ static int included_patches[] = {
   2164,
   2163,
   2162,
-  // 2161,
+  2161,
   2160,
   2159,
   2158,
-- 
cgit