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 ce911b81b0f515b25e5092de6cee0f993a27c067..91faabeeb094dc5d1523a12da2e2a29ad88154bf 100644 (file)
--- 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 2dd143b5a93231ba8e2c567cf49603e49ab784ea..728dadf5a0ee093b62d47fdb9fae3e1e7f2dc597 100644 (file)
--- 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,
 /**/