summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fold.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/fold.c b/src/fold.c
index d9cba6a223..d4a6267539 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -307,7 +307,7 @@ foldedCount(win_T *win, linenr_T lnum, foldinfo_T *infop)
int
foldmethodIsManual(win_T *wp)
{
- return (wp->w_p_fdm[3] == 'u');
+ return (wp->w_p_fdm[0] != NUL && wp->w_p_fdm[3] == 'u');
}
// foldmethodIsIndent() {{{2
@@ -327,7 +327,7 @@ foldmethodIsIndent(win_T *wp)
int
foldmethodIsExpr(win_T *wp)
{
- return (wp->w_p_fdm[1] == 'x');
+ return (wp->w_p_fdm[0] != NUL && wp->w_p_fdm[1] == 'x');
}
// foldmethodIsMarker() {{{2
@@ -337,7 +337,7 @@ foldmethodIsExpr(win_T *wp)
int
foldmethodIsMarker(win_T *wp)
{
- return (wp->w_p_fdm[2] == 'r');
+ return (wp->w_p_fdm[0] != NUL && wp->w_p_fdm[2] == 'r');
}
// foldmethodIsSyntax() {{{2
diff --git a/src/version.c b/src/version.c
index 1a39190876..58a1856040 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3662,
+/**/
3661,
/**/
3660,