# HG changeset patch # User Bram Moolenaar # Date 1421962916 -3600 # Node ID 7b8e3be930f39af3cdc1fe969a6de16f2d91e5d2 # Parent 41aee763b81976aa089030073613e78dd61df8df updated for version 7.4.591 Problem: test_listlbr_utf8 fails when the conceal feature is not available. Solution: Check for the conceal feature. (Kazunobu Kuriyama) diff --git a/src/testdir/test_listlbr_utf8.in b/src/testdir/test_listlbr_utf8.in --- a/src/testdir/test_listlbr_utf8.in +++ b/src/testdir/test_listlbr_utf8.in @@ -2,7 +2,7 @@ Test for linebreak and list option in ut STARTTEST :so small.vim -:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif +:if !exists("+linebreak") || !has("conceal") | e! test.ok | w! test.out | qa! | endif :so mbyte.vim :if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif :10new|:vsp|:vert resize 20 diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 591, +/**/ 590, /**/ 589,