diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-01-22 22:41:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-01-22 22:41:56 +0100 |
| commit | df82661c9cf24a8947584197c756a88add5406ca (patch) | |
| tree | f2af0a0d506366e58ae9f858e0e8476b3bb31cd4 | |
| parent | eea478f885ab2fb4185053f1093d05b83bbdf5e1 (diff) | |
updated for version 7.4.591v7.4.591
Problem: test_listlbr_utf8 fails when the conceal feature is not available.
Solution: Check for the conceal feature. (Kazunobu Kuriyama)
| -rw-r--r-- | src/testdir/test_listlbr_utf8.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 591, +/**/ 590, /**/ 589, |