Mercurial > vim

changeset 9854:eed41404e383 v7.4.2202

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/b33848315290a789f7bf05aff0d493b5b9265a2d Author: Bram Moolenaar <Bram@vim.org> Date: Fri Aug 12 18:51:58 2016 +0200 patch 7.4.2202 Problem: Build fails with small features. Solution: Correct option initialization.
author Christian Brabandt <cb@256bit.org>
date Fri, 12 Aug 2016 19:00:07 +0200
parents e09af3fc1752
children b0becf7cf2ef
files src/option.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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},
--- 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,