diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 22:08:14 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 22:08:14 -0300 |
| commit | a6e53a3797a93fe060f807fe2e4c6361854b6c97 (patch) | |
| tree | b684785ba9c769491e6ebdac8e21495cf22dbdd3 /src/nvim/fold.c | |
| parent | d2d99454e63c0e6649fddd52bbd9a10d27c2e347 (diff) | |
| parent | 2aa2513b8e023a0d7bd2071299f0ea59a4d4ce25 (diff) | |
| download | rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.tar.gz rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.tar.bz2 rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.zip | |
Merge PR #2076 'Builtin terminal emulation'
Diffstat (limited to 'src/nvim/fold.c')
| -rw-r--r-- | src/nvim/fold.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c index a1fbdf7791..267c586543 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -137,7 +137,7 @@ void copyFoldingState(win_T *wp_from, win_T *wp_to) int hasAnyFolding(win_T *win) { /* very simple now, but can become more complex later */ - return win->w_p_fen + return !win->w_buffer->terminal && win->w_p_fen && (!foldmethodIsManual(win) || !GA_EMPTY(&win->w_folds)); } @@ -768,6 +768,9 @@ void clearFolding(win_T *win) void foldUpdate(win_T *wp, linenr_T top, linenr_T bot) { fold_T *fp; + if (wp->w_buffer->terminal) { + return; + } /* Mark all folds from top to bot as maybe-small. */ (void)foldFind(&curwin->w_folds, top, &fp); @@ -1563,7 +1566,7 @@ static void setSmallMaybe(garray_T *gap) */ static void foldCreateMarkers(linenr_T start, linenr_T end) { - if (!curbuf->b_p_ma) { + if (!MODIFIABLE(curbuf)) { EMSG(_(e_modifiable)); return; } |