From 0689b870595c687a23e102913ce5037f65d03748 Mon Sep 17 00:00:00 2001 From: Shota Nozaki Date: Wed, 3 Jan 2024 19:18:43 +0100 Subject: patch 9.1.0002: a closing fold expr, may start a new fold Problem: a closing fold expression may unexpectedly start a new fold when it should end a fold (reported by Shota Nozaki) Solution: if a fold hasn't started yet, do not immediately start a new fold with level 1 (Shota Nozaki) fixes: #12768 closes: #13748 Signed-off-by: Shota Nozaki Signed-off-by: Christian Brabandt --- src/fold.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/fold.c') diff --git a/src/fold.c b/src/fold.c index be20991c7a..5c41ed1b05 100644 --- a/src/fold.c +++ b/src/fold.c @@ -3362,7 +3362,9 @@ foldlevelExpr(fline_T *flp) break; // "<1", "<2", .. : end a fold with a certain level - case '<': flp->lvl_next = n - 1; + case '<': // To prevent an unexpected start of a new fold, the next + // level must not exceed the level of the current fold. + flp->lvl_next = MIN(flp->lvl, n - 1); flp->end = n; break; -- cgit v1.2.3