From: Bram Moolenaar Date: Wed, 17 Dec 2014 13:42:46 +0000 (+0100) Subject: updated for version 7.4.555 X-Git-Tag: v7.4.555 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36ff08479f0398e09298f5742dcdfa0f8e070a32;p=vim updated for version 7.4.555 Problem: test_close_count may fail for some combination of features. Solution: Require normal features. --- 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 555, /**/ 554, /**/