diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-02-03 22:36:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 22:36:52 -0500 |
| commit | b96db38af184b1a271c88a4c89e709ce32143514 (patch) | |
| tree | 9bf20d69202e83921a657fab8baef564368e173a /src/nvim/fold.c | |
| parent | 4a1a86a2bea4b88a8c981cabf2cf131830012edc (diff) | |
| parent | da3f9778aff8cfa134adec3fca93c00d82bcf4af (diff) | |
| download | rneovim-b96db38af184b1a271c88a4c89e709ce32143514.tar.gz rneovim-b96db38af184b1a271c88a4c89e709ce32143514.tar.bz2 rneovim-b96db38af184b1a271c88a4c89e709ce32143514.zip | |
Merge pull request #13865 from janlazo/vim-8.2.2437
vim-patch:8.2.{2437,2439,2442,2446,2447,2448,2457,2458,2462,2464}
Diffstat (limited to 'src/nvim/fold.c')
| -rw-r--r-- | src/nvim/fold.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 0593c16999..5032646d7e 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -2999,7 +2999,6 @@ static void foldlevelDiff(fline_T *flp) static void foldlevelExpr(fline_T *flp) { win_T *win; - int n; int c; linenr_T lnum = flp->lnum + flp->off; @@ -3017,7 +3016,7 @@ static void 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. */ const bool save_keytyped = KeyTyped; - n = (int)eval_foldexpr(flp->wp->w_p_fde, &c); + const int n = eval_foldexpr(flp->wp->w_p_fde, &c); KeyTyped = save_keytyped; switch (c) { @@ -3202,8 +3201,10 @@ int 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; + } } /* If some folds are manually opened/closed, need to restore that. */ |