summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-21 22:35:10 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-21 22:35:10 +0100
commit573e445664eef399a72b1bfc975260a639605fef (patch)
tree548cde2f55d59feb6ef3ac9d604b848d139b0cda
parentd63aff0a65b955447de2fd8bfdaee29b61ce2843 (diff)
downloadvim-git-573e445664eef399a72b1bfc975260a639605fef.tar.gz
patch 7.4.1631v7.4.1631
Problem: Compiler doesn't understand switch on all enum values. (Tony Mechelynck) Solution: Initialize variable.
-rw-r--r--src/channel.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c
index 1f6df415c..64393f974 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2100,7 +2100,7 @@ channel_part_info(channel_T *channel, dict_T *dict, char *name, int part)
chanpart_T *chanpart = &channel->ch_part[part];
char namebuf[20];
size_t tail;
- char *s;
+ char *s = "";
STRCPY(namebuf, name);
STRCAT(namebuf, "_");
diff --git a/src/version.c b/src/version.c
index 808cee79e..bc119482b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1631,
+/**/
1630,
/**/
1629,