summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fold.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fold.c b/src/fold.c
index d95b46b5b4..5c55b0777b 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -3059,7 +3059,7 @@ truncate_fold(fold_T *fp, linenr_T end)
}
#define fold_end(fp) ((fp)->fd_top + (fp)->fd_len - 1)
-#define valid_fold(fp, gap) ((fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
+#define valid_fold(fp, gap) ((gap)->ga_len > 0 && (fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
#define fold_index(fp, gap) ((size_t)(fp - ((fold_T *)(gap)->ga_data)))
void
diff --git a/src/version.c b/src/version.c
index 29f4363415..80c39982d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1561,
+/**/
1560,
/**/
1559,