commit f9547eb6ef02e305203b859d2dcfdae930b9d544
author Bram Moolenaar <Bram@vim.org> Mon Feb 01 19:24:55 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Feb 01 19:24:55 2021 +0100
tree 825661ccdf026bb8e954912baaae39acd1d8d540
parent 5daa91162699e4f8b54f9d1caaaab2715038941c

patch 8.2.2447: 'foldlevel' not applied to folds restored from session

Problem:    'foldlevel' not applied to folds restored from session.
Solution:   Set 'foldlevel' after creaiting the folds. (closes #7767)

src/fold.c

diff --git a/src/fold.c b/src/fold.c
index f889f4c..75b436a 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -3309,7 +3309,7 @@
     // KeyTyped may be reset to 0 when calling a function which invokes
     // do_cmdline().  To make 'foldopen' work correctly restore KeyTyped.
     save_keytyped = KeyTyped;
-    n = (int)eval_foldexpr(flp->wp->w_p_fde, &c);
+    n = eval_foldexpr(flp->wp->w_p_fde, &c);
     KeyTyped = save_keytyped;
 
     switch (c)
@@ -3526,7 +3526,8 @@
     if (foldmethodIsManual(wp))
     {
 	if (put_line(fd, "silent! normal! zE") == FAIL
-		|| put_folds_recurse(fd, &wp->w_folds, (linenr_T)0) == FAIL)
+		|| put_folds_recurse(fd, &wp->w_folds, (linenr_T)0) == FAIL
+		|| put_line(fd, "let &fdl = &fdl") == FAIL)
 	    return FAIL;
     }
 

src/testdir/test_mksession.vim

diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index 723eb8e..82c96ce 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -504,6 +504,32 @@
   call delete('Xtestview')
 endfunc
 
+func Test_mkview_open_folds()
+  enew!
+
+  call append(0, ['a', 'b', 'c'])
+  1,3fold
+  " zR affects 'foldlevel', make sure the option is applied after the folds
+  " have been recreated.
+  normal zR
+  write! Xtestfile
+
+  call assert_equal(-1, foldclosed(1))
+  call assert_equal(-1, foldclosed(2))
+  call assert_equal(-1, foldclosed(3))
+
+  mkview! Xtestview
+  source Xtestview
+
+  call assert_equal(-1, foldclosed(1))
+  call assert_equal(-1, foldclosed(2))
+  call assert_equal(-1, foldclosed(3))
+
+  call delete('Xtestview')
+  call delete('Xtestfile')
+  %bwipe
+endfunc
+
 " Test :mkview with a file argument.
 func Test_mkview_file()
   " Create a view with line number and a fold.

src/version.c

diff --git a/src/version.c b/src/version.c
index bba9da8..61acfad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2447,
+/**/
     2446,
 /**/
     2445,