summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-12-17 14:42:46 +0100
committerBram Moolenaar <Bram@vim.org>2014-12-17 14:42:46 +0100
commit36ff08479f0398e09298f5742dcdfa0f8e070a32 (patch)
tree3b6550747c8edf836152bba755d7d4d5d1075df8
parent6f2dd9e75eab236d1bcc63b17d02f554111f87ec (diff)
downloadvim-git-7.4.555.tar.gz
updated for version 7.4.555v7.4.555
Problem: test_close_count may fail for some combination of features. Solution: Require normal features.
-rw-r--r--src/testdir/test_close_count.in5
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/testdir/test_close_count.in b/src/testdir/test_close_count.in
index 288945c69..8a4e090ed 100644
--- a/src/testdir/test_close_count.in
+++ b/src/testdir/test_close_count.in
@@ -1,8 +1,8 @@
Tests for :[count]close! and :[count]hide vim: set ft=vim :
STARTTEST
+:so small.vim
:let tests = []
-:so tiny.vim
:for i in range(5)
:new
:endfor
@@ -46,7 +46,6 @@ ENDTEST
STARTTEST
:let tests = []
-:so tiny.vim
:for i in range(5)
:new
:endfor
@@ -94,7 +93,6 @@ ENDTEST
STARTTEST
:let tests = []
-:so tiny.vim
:set hidden
:for i in range(5)
:new
@@ -123,7 +121,6 @@ ENDTEST
STARTTEST
:let tests = []
-:so tiny.vim
:set hidden
:for i in range(5)
:new
diff --git a/src/version.c b/src/version.c
index cd7bfb129..0c8b39a0e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 555,
+/**/
554,
/**/
553,