From ba81e4660b155b212fe0a913ca102a510105562b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 9 Feb 2011 15:59:37 +0100 Subject: [PATCH] updated for version 7.3.114 Problem: Potential problem in initialization when giving an error message early. Solution: Initialize 'verbosefile' empty. (Ben Schmidt) --- src/option.h | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) 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, /**/ -- 2.47.2