diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-11-01 11:44:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-11-01 11:44:31 +0000 |
| commit | 74c596b5a8210293292cf512930f555e2b16a3db (patch) | |
| tree | c9e3e4a741915b1d17fb218c7fb0b0ef257c5b32 | |
| parent | 0cae847008c1b593c4fef30274e42199a5cc523f (diff) | |
| download | vim-git-74c596b5a8210293292cf512930f555e2b16a3db.tar.gz | |
updated for version 7.0-154v7.0.154
| -rw-r--r-- | src/fold.c | 4 | ||||
| -rw-r--r-- | src/syntax.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/fold.c b/src/fold.c index bb7b8b7cc..a28a8747c 100644 --- a/src/fold.c +++ b/src/fold.c @@ -2971,7 +2971,11 @@ foldlevelIndent(flp) else flp->lvl = get_indent_buf(buf, lnum) / buf->b_p_sw; if (flp->lvl > flp->wp->w_p_fdn) + { flp->lvl = flp->wp->w_p_fdn; + if (flp->lvl < 0) + flp->lvl = 0; + } } /* foldlevelDiff() {{{2 */ diff --git a/src/syntax.c b/src/syntax.c index 1b09e707b..d5047c7c6 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -6072,7 +6072,11 @@ syn_get_foldlevel(wp, lnum) ++level; } if (level > wp->w_p_fdn) + { level = wp->w_p_fdn; + if (level < 0) + level = 0; + } return level; } #endif diff --git a/src/version.c b/src/version.c index fe3ea424d..6e5b5dfff 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 154, +/**/ 153, /**/ 152, |