summaryrefslogtreecommitdiff
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
commit272daffc7f4b75d2407b70fd08293189bfab6754 (patch)
tree57e7efcb903c491942e437e16465afeb19386c50
parentafb676a1ba67a12df52c25449926f83c2563e874 (diff)
downloadvim-272daffc7f4b75d2407b70fd08293189bfab6754.tar.gz
updated for version 7.3.547v7.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 c1666ac6..ca327b95 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 89faaca6..d07a09cd 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,