summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-06-22 23:03:12 +0200
committerBram Moolenaar <Bram@vim.org>2017-06-22 23:03:12 +0200
commit4670490673ed98502a09b74fbabe785b47e3d289 (patch)
tree2b8d9455d8c78e5f0f29b15c68a108143d803c21
parenta529ce068ba84d53343f3732b6a1ed4ad1fe3a68 (diff)
patch 8.0.0662: stray FIXME for fixed problemv8.0.0662
Problem: Stray FIXME for fixed problem. Solution: Remove the comment. (Dominique Pelle)
-rw-r--r--src/testdir/test_syntax.vim6
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index 0b1b4e46b3..4230865e5a 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 228525ca4b..ab7a92992a 100644
--- 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,