summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-25 22:37:15 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-25 22:37:15 +0100
commit376407674ff10b60e7c6090906be50982763f0f3 (patch)
treefb830a77dc0bcc1498fdff019ec4e348118941ec /src
parenta713ff819d134dc34e507c05273c935bfc17e795 (diff)
patch 8.0.0373: build fails without +foldingv8.0.0373
Problem: Build fails without +folding. Solution: Move misplaced #ifdef.
Diffstat (limited to 'src')
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 959af4fa4e..459179e2e1 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1278,8 +1278,8 @@ static struct vimoption options[] =
#endif
SCRIPTID_INIT},
{"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
-#ifdef FEAT_FOLDING
P_RWIN|P_ONECOMMA|P_NODUP,
+#ifdef FEAT_FOLDING
(char_u *)VAR_WIN, PV_FMR,
{(char_u *)"{{{,}}}", (char_u *)NULL}
#else
diff --git a/src/version.c b/src/version.c
index 3b8c12705f..b008d14088 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 373,
+/**/
372,
/**/
371,