From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Feb 2011 14:59:37 +0000 (+0100)
Subject: updated for version 7.3.114
X-Git-Tag: v7.3.114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba81e4660b155b212fe0a913ca102a510105562b;p=thirdparty%2Fvim.git

updated for version 7.3.114
Problem:    Potential problem in initialization when giving an error message
            early.
Solution:   Initialize 'verbosefile' empty. (Ben Schmidt)
---

diff --git a/src/option.h b/src/option.h
index ce911b81b0..91faabeeb0 100644
--- a/src/option.h
+++ b/src/option.h
@@ -854,7 +854,11 @@ static char *(p_ve_values[]) = {"block", "insert", "all", "onemore", NULL};
 # define VE_ONEMORE	8
 #endif
 EXTERN long	p_verbose;	/* 'verbose' */
+#ifdef IN_OPTION_C
+char_u	*p_vfile = (char_u *)""; /* used before options are initialized */
+#else
 EXTERN char_u	*p_vfile;	/* 'verbosefile' */
+#endif
 EXTERN int	p_warn;		/* 'warn' */
 #ifdef FEAT_CMDL_COMPL
 EXTERN char_u	*p_wop;		/* 'wildoptions' */
diff --git a/src/version.c b/src/version.c
index 2dd143b5a9..728dadf5a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    114,
 /**/
     113,
 /**/