Mercurial > vim

changeset 6528:7b8e3be930f3 v7.4.591

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 22 Jan 2015 22:41:56 +0100
parents 41aee763b819
children 3d2db5a7403f
files src/testdir/test_listlbr_utf8.in src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,