From: Bram Moolenaar Date: Sat, 30 Aug 2014 16:10:18 +0000 (+0200) Subject: updated for version 7.4.430 X-Git-Tag: v7.4.430 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d5fbe7a2b4cc948c54afeae5375b247bf34ba9b;p=vim updated for version 7.4.430 Problem: test_listlbr fails when compiled with normal features. Solution: Check for the +conceal feature. --- diff --git a/src/testdir/test_listlbr.in b/src/testdir/test_listlbr.in index 2f2812655..f155f85a4 100644 --- a/src/testdir/test_listlbr.in +++ b/src/testdir/test_listlbr.in @@ -2,7 +2,7 @@ Test for linebreak and list option (non-utf8) STARTTEST :so small.vim -:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif +:if !exists("+linebreak") || !exists("+conceal") | e! test.ok | w! test.out | qa! | endif :10new|:vsp|:vert resize 20 :put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \" :norm! zt diff --git a/src/version.c b/src/version.c index 8f3549924..b81d54781 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 */ +/**/ + 430, /**/ 429, /**/