From 3f3897e41f77a7bcd44ffd37acd4d524c0169ed4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 4 Mar 2017 15:28:53 +0100
Subject: [PATCH] patch 8.0.0407: filtering folds with marker method not tested

Problem:    Filtering folds with marker method not tested.
Solution:   Also set 'foldmethod' to "marker".
---
 src/testdir/test_fold.vim | 27 ++++++++++++++++-----------
 src/version.c             |  2 ++
 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
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    407,
 /**/
     406,
 /**/
-- 
2.50.1