diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-02-09 15:59:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-02-09 15:59:37 +0100 |
| commit | ba81e4660b155b212fe0a913ca102a510105562b (patch) | |
| tree | 7d50f657739dd7c56c9ace64c564d90f957e4cc6 | |
| parent | b18919146d0285cc6a4fee76de849ab1fc672d37 (diff) | |
| download | vim-git-ba81e4660b155b212fe0a913ca102a510105562b.tar.gz | |
updated for version 7.3.114v7.3.114
Problem: Potential problem in initialization when giving an error message
early.
Solution: Initialize 'verbosefile' empty. (Ben Schmidt)
| -rw-r--r-- | src/option.h | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/option.h b/src/option.h index ce911b81b..91faabeeb 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 2dd143b5a..728dadf5a 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 114, +/**/ 113, /**/ 112, |