diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-08-30 18:10:18 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-08-30 18:10:18 +0200 |
commit | 5d5fbe7a2b4cc948c54afeae5375b247bf34ba9b (patch) | |
tree | 3ec15ad81240a3f7639686ac209ae1bac1abc806 | |
parent | 84d8cdd76900a8834260bc69d0be202923614ae0 (diff) | |
download | vim-git-5d5fbe7a2b4cc948c54afeae5375b247bf34ba9b.tar.gz |
updated for version 7.4.430v7.4.430
Problem: test_listlbr fails when compiled with normal features.
Solution: Check for the +conceal feature.
-rw-r--r-- | src/testdir/test_listlbr.in | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 430, +/**/ 429, /**/ 428, |