summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-04 15:28:53 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-04 15:28:53 +0100
commit3f3897e41f77a7bcd44ffd37acd4d524c0169ed4 (patch)
treed09dd1ab61a0741d348874ed6ba0adffe4f58fc9
parent7f73b54631af3f0e6f0acd1a1b4c9e8436784705 (diff)
downloadvim-git-3f3897e41f77a7bcd44ffd37acd4d524c0169ed4.tar.gz
patch 8.0.0407: filtering folds with marker method not testedv8.0.0407
Problem: Filtering folds with marker method not tested. Solution: Also set 'foldmethod' to "marker".
-rw-r--r--src/testdir/test_fold.vim27
-rw-r--r--src/version.c2
2 files changed, 18 insertions, 11 deletions
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 1f835b876..cdf9fd314 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -100,15 +100,20 @@ func Test_manual_fold_with_filter()
if !executable('cat')
return
endif
- new
- call setline(1, range(1, 20))
- 4,$fold
- %foldopen
- 10,$fold
- %foldopen
- " This filter command should not have an effect
- 1,8! cat
- call feedkeys('5ggzdzMGdd', 'xt')
- call assert_equal(['1', '2', '3', '4', '5', '6', '7', '8', '9'], getline(1, '$'))
- bwipe!
+ for type in ['manual', 'marker']
+ exe 'set foldmethod=' . type
+ new
+ call setline(1, range(1, 20))
+ 4,$fold
+ %foldopen
+ 10,$fold
+ %foldopen
+ " This filter command should not have an effect
+ 1,8! cat
+ call feedkeys('5ggzdzMGdd', 'xt')
+ call assert_equal(['1', '2', '3', '4', '5', '6', '7', '8', '9'], getline(1, '$'))
+
+ bwipe!
+ set foldmethod&
+ endfor
endfunc
diff --git a/src/version.c b/src/version.c
index cc69b3cbb..39c6b4e41 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 */
/**/
+ 407,
+/**/
406,
/**/
405,