summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-10-28 22:10:27 +0200
committerBram Moolenaar <Bram@vim.org>2016-10-28 22:10:27 +0200
commit35a1f59d635d9a655e1267c18f7cc757afd0d5b0 (patch)
tree66f6f091c7a92cea82ab17299dd99f35a1769e0a /src
parent14207f487c9e79a913256a41e3e9716b03b46955 (diff)
downloadvim-git-35a1f59d635d9a655e1267c18f7cc757afd0d5b0.tar.gz
patch 8.0.0052v8.0.0052
Problem: Conceal test passes even without the bug fix. Solution: Add a redraw command. (Christian Brabandt)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_matchadd_conceal.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_matchadd_conceal.vim b/src/testdir/test_matchadd_conceal.vim
index 610917fd1..d285a4c75 100644
--- a/src/testdir/test_matchadd_conceal.vim
+++ b/src/testdir/test_matchadd_conceal.vim
@@ -281,6 +281,7 @@ function! Test_matchadd_and_syn_conceal()
call assert_notequal(screenattr(1, 11) , screenattr(1, 12))
call assert_equal(screenattr(1, 11) , screenattr(1, 32))
call matchadd('CheckedByCoq', '\%<2l\%>9c\%<16c')
+ redraw!
call assert_equal(expect, s:screenline(1))
call assert_notequal(screenattr(1, 10) , screenattr(1, 11))
call assert_notequal(screenattr(1, 11) , screenattr(1, 12))
diff --git a/src/version.c b/src/version.c
index a6f915a8a..5e337d6a1 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 */
/**/
+ 52,
+/**/
51,
/**/
50,