Mercurial > vim

changeset 11559:597205f1230e v8.0.0662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0662: stray FIXME for fixed problem commit https://github.com/vim/vim/commit/4670490673ed98502a09b74fbabe785b47e3d289 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jun 22 23:03:12 2017 +0200 patch 8.0.0662: stray FIXME for fixed problem Problem: Stray FIXME for fixed problem. Solution: Remove the comment. (Dominique Pelle)
author Christian Brabandt <cb@256bit.org>
date Thu, 22 Jun 2017 23:15:03 +0200
parents 094d9d2996d3
children 82b136697769
files src/testdir/test_syntax.vim src/version.c
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -478,12 +478,6 @@ func Test_conceal()
 
   set conceallevel=1
   call assert_equal('1X 6   ', ScreenLines(2, 7)[0])
-  " FIXME: with conceallevel=1, I would expect that the portion "45" of
-  " the line to be replaced with a space since ":help 'conceallevel'
-  " states that if listchars is not set, then the default replacement
-  " should be a space. But synconcealed() gives an empty string in
-  " the 2nd value of the returned list. Bug?
-  " So for now, the following line is commented out:
   call assert_equal([[0, ''], [1, 'X'], [1, 'X'], [1, ' '], [1, ' '], [0, '']], map(range(1, 6), 'synconcealed(2, v:val)[0:1]'))
 
   set conceallevel=1
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    662,
+/**/
     661,
 /**/
     660,