diff options
| -rw-r--r-- | src/ops.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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, |