summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-15 22:54:49 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-15 22:54:49 +0200
commit22177f0c0826e3b2411a5e9d050b50200877ecd3 (patch)
treec1dff02078ef7af94508e29bb70cb16b3e9a9be9
parent386600f0cbcb8add099c723cf84634f46df2f788 (diff)
downloadvim-22177f0c0826e3b2411a5e9d050b50200877ecd3.zip
patch 7.4.2216
Problem: Test fails without the +sign feature. Solution: Only check for signcolumn with the +sign feature.
-rw-r--r--src/testdir/test_bufwintabinfo.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_bufwintabinfo.vim b/src/testdir/test_bufwintabinfo.vim
index fa9d97bc8..ec1f53841 100644
--- a/src/testdir/test_bufwintabinfo.vim
+++ b/src/testdir/test_bufwintabinfo.vim
@@ -49,7 +49,9 @@ function Test_getbufwintabinfo()
call assert_equal(winbufnr(2), winlist[1].bufnum)
call assert_equal(winheight(2), winlist[1].height)
call assert_equal(1, winlist[2].nr)
- call assert_equal('auto', winlist[0].options.signcolumn)
+ if has('signs')
+ call assert_equal('auto', winlist[0].options.signcolumn)
+ endif
call assert_equal(2, winlist[3].tpnr)
call assert_equal('green', winlist[2].variables.signal)
call assert_equal(winwidth(1), winlist[0].width)
diff --git a/src/version.c b/src/version.c
index 50a0c7f2d..60d63d0a5 100644
--- 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 */
/**/
+ 2216,
+/**/
2215,
/**/
2214,