summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-12 18:51:58 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-12 18:51:58 +0200
commitb33848315290a789f7bf05aff0d493b5b9265a2d (patch)
tree48624190191df0ef8ed384903cd3de04e87ca182
parent95ec9d6a6ab3117d60ff638670a803d43974ba51 (diff)
patch 7.4.2202v7.4.2202
Problem: Build fails with small features. Solution: Correct option initialization.
-rw-r--r--src/option.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 7146503eb3..ba07482429 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2416,11 +2416,12 @@ static struct vimoption options[] =
{"signcolumn", "scl", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN,
#ifdef FEAT_SIGNS
(char_u *)VAR_WIN, PV_SCL,
- {(char_u *)"auto", (char_u *)0L} SCRIPTID_INIT},
+ {(char_u *)"auto", (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)NULL, (char_u *)0L}
#endif
+ SCRIPTID_INIT},
{"slowopen", "slow", P_BOOL|P_VI_DEF,
(char_u *)NULL, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
diff --git a/src/version.c b/src/version.c
index 58893c5dbb..e30f627648 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2202,
+/**/
2201,
/**/
2200,