From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 22 Jan 2015 21:41:56 +0000 (+0100)
Subject: updated for version 7.4.591
X-Git-Tag: v7.4.591
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df82661c9cf24a8947584197c756a88add5406ca;p=thirdparty%2Fvim.git

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
index b3d05dfaed..bb6350ddec 100644
--- 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 utf-8 mode
 
 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
index bef9b19a00..33f8a97271 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 */
+/**/
+    591,
 /**/
     590,
 /**/