summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fold.c2
-rw-r--r--src/testdir/test_fold.vim7
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/fold.c b/src/fold.c
index 82ce7e707d..f889f4c74d 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -916,7 +916,7 @@ foldMoveTo(
{
if (!foldFind(gap, curwin->w_cursor.lnum - lnum_off, &fp))
{
- if (!updown)
+ if (!updown || gap->ga_len == 0)
break;
// When moving up, consider a fold above the cursor; when
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 505ad02392..b978fc080f 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -852,4 +852,11 @@ func Test_fold_create_delete_create()
bwipe!
endfunc
+" this was crashing
+func Test_fold_create_delete()
+ new
+ norm zFzFzdzj
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index e9c65bca54..5ed39fe534 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 */
/**/
+ 2176,
+/**/
2175,
/**/
2174,