summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-08 22:57:24 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-08 22:57:24 +0100
commit2fc83fcd1d6dfd4728a2ef70e2316f79203c7ee0 (patch)
tree26112e4e55774f0f430e41cab5985c6686df26b4
parentb92abad0c58de36d0b0afdcd4ec05261fa1fa84c (diff)
downloadvim-git-2fc83fcd1d6dfd4728a2ef70e2316f79203c7ee0.tar.gz
patch 7.4.1292v7.4.1292
Problem: Some compilers complain about uninitialzed variable, even though all possible cases are handled. (Dominique Pelle) Solution: Add a default initialization.
-rw-r--r--src/eval.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c
index b544fc349..33f95ef30 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10611,7 +10611,7 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
static void
f_empty(typval_T *argvars, typval_T *rettv)
{
- int n;
+ int n = FALSE;
switch (argvars[0].v_type)
{
@@ -19935,7 +19935,7 @@ f_trunc(typval_T *argvars, typval_T *rettv)
static void
f_type(typval_T *argvars, typval_T *rettv)
{
- int n;
+ int n = -1;
switch (argvars[0].v_type)
{
@@ -24952,7 +24952,7 @@ write_viminfo_varlist(FILE *fp)
hashitem_T *hi;
dictitem_T *this_var;
int todo;
- char *s;
+ char *s = "";
char_u *p;
char_u *tofree;
char_u numbuf[NUMBUFLEN];
diff --git a/src/version.c b/src/version.c
index 9b9702aa2..d9f080719 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1292,
+/**/
1291,
/**/
1290,