summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fold.c5
-rw-r--r--src/testdir/test_fold.vim10
-rw-r--r--src/version.c2
3 files changed, 16 insertions, 1 deletions
diff --git a/src/fold.c b/src/fold.c
index 4b4e618299..82ce7e707d 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -640,7 +640,10 @@ foldCreate(linenr_T start, linenr_T end)
break;
}
}
- i = (int)(fp - (fold_T *)gap->ga_data);
+ if (gap->ga_len == 0)
+ i = 0;
+ else
+ i = (int)(fp - (fold_T *)gap->ga_data);
}
if (ga_grow(gap, 1) == OK)
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index f0bd6e481d..1377983ca1 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -844,4 +844,14 @@ func Test_move_no_folds()
bwipe!
endfunc
+" this was crashing
+func Test_fold_create_delete_create()
+ new
+ fold
+ fold
+ normal zd
+ fold
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 91477bcef2..e2affa79ed 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 */
/**/
+ 1972,
+/**/
1971,
/**/
1970,