073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.591
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.591 (after 7.4.587)
073263
Problem:    test_listlbr_utf8 fails when the conceal feature is not available.
073263
Solution:   Check for the conceal feature. (Kazunobu Kuriyama)
073263
Files:	    src/testdir/test_listlbr_utf8.in
073263
073263
073263
*** ../vim-7.4.590/src/testdir/test_listlbr_utf8.in	2015-01-20 19:01:32.380444290 +0100
073263
--- src/testdir/test_listlbr_utf8.in	2015-01-22 22:37:43.523361845 +0100
073263
***************
073263
*** 2,8 ****
073263
  
073263
  STARTTEST
073263
  :so small.vim
073263
! :if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
073263
  :so mbyte.vim
073263
  :if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif
073263
  :10new|:vsp|:vert resize 20
073263
--- 2,8 ----
073263
  
073263
  STARTTEST
073263
  :so small.vim
073263
! :if !exists("+linebreak") || !has("conceal") | e! test.ok | w! test.out | qa! | endif
073263
  :so mbyte.vim
073263
  :if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif
073263
  :10new|:vsp|:vert resize 20
073263
*** ../vim-7.4.590/src/version.c	2015-01-22 22:40:16.345651420 +0100
073263
--- src/version.c	2015-01-22 22:41:26.464867079 +0100
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     591,
073263
  /**/
073263
073263
-- 
073263
hundred-and-one symptoms of being an internet addict:
073263
107. When using your phone you forget that you don't have to use your
073263
     keyboard.
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///