summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-06-06 23:08:38 +0200
committerBram Moolenaar <Bram@vim.org>2012-06-06 23:08:38 +0200
commit802053f14ac4da63c027df2f1a8333c9a26da7dc (patch)
tree75c7d5542e155cabb9b26ad042e8ac6f59257c6b
parent3b393a0b537cd7057d3462ef16685b3957eb8e1a (diff)
updated for version 7.3.547v7.3.547
Problem: Compiler warning for uninitialized variable. Solution: Initialize it.
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index c1666ac696..ca327b955d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -4306,7 +4306,7 @@ do_join(count, insert_space, save_undo, use_formatoptions)
colnr_T col = 0;
int ret = OK;
#if defined(FEAT_COMMENTS) || defined(PROTO)
- int *comments;
+ int *comments = NULL;
int remove_comments = (use_formatoptions == TRUE)
&& has_format_option(FO_REMOVE_COMS);
int prev_was_comment;
diff --git a/src/version.c b/src/version.c
index 89faaca6fb..d07a09cd99 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 */
/**/
+ 547,
+/**/
546,
/**/
545,