diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-01 19:24:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-01 19:24:55 +0100 |
| commit | f9547eb6ef02e305203b859d2dcfdae930b9d544 (patch) | |
| tree | 825661ccdf026bb8e954912baaae39acd1d8d540 /src | |
| parent | 5daa91162699e4f8b54f9d1caaaab2715038941c (diff) | |
| download | vim-git-f9547eb6ef02e305203b859d2dcfdae930b9d544.tar.gz | |
patch 8.2.2447: 'foldlevel' not applied to folds restored from sessionv8.2.2447
Problem: 'foldlevel' not applied to folds restored from session.
Solution: Set 'foldlevel' after creaiting the folds. (closes #7767)
Diffstat (limited to 'src')
| -rw-r--r-- | src/fold.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_mksession.vim | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 31 insertions, 2 deletions
diff --git a/src/fold.c b/src/fold.c index f889f4c74..75b436a67 100644 --- a/src/fold.c +++ b/src/fold.c @@ -3309,7 +3309,7 @@ foldlevelExpr(fline_T *flp) // 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 @@ put_folds(FILE *fd, win_T *wp) 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; } diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim index 723eb8ed2..82c96ce63 100644 --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -504,6 +504,32 @@ func Test_mkview_terminal_windows() 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. diff --git a/src/version.c b/src/version.c index bba9da818..61acfadd4 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2447, +/**/ 2446, /**/ 2445, |