Mercurial > vim

changeset 10968:0cfcbb7046b6 v8.0.0373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0373: build fails without +folding commit https://github.com/vim/vim/commit/376407674ff10b60e7c6090906be50982763f0f3 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 25 22:37:15 2017 +0100 patch 8.0.0373: build fails without +folding Problem: Build fails without +folding. Solution: Move misplaced #ifdef.
author Christian Brabandt <cb@256bit.org>
date Sat, 25 Feb 2017 22:45:04 +0100
parents 2828f870f481
children beefabd60ec9
files src/option.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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|
+						    P_RWIN|P_ONECOMMA|P_NODUP,
 #ifdef FEAT_FOLDING
-						    P_RWIN|P_ONECOMMA|P_NODUP,
 			    (char_u *)VAR_WIN, PV_FMR,
 			    {(char_u *)"{{{,}}}", (char_u *)NULL}
 #else
--- 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,