summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-20 15:26:42 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-20 15:26:42 +0100
commitc6b14f0a8346ec7ddd86f3349d0b861a1b500147 (patch)
tree8be47baa426fa12875c4ee6b5dff5d75ba32e9ea
parent663128270e6ea6b529c45ceee4b369734b8b2fdb (diff)
downloadvim-git-c6b14f0a8346ec7ddd86f3349d0b861a1b500147.tar.gz
patch 7.4.1367v7.4.1367
Problem: Compiler warning for unreachable code. Solution: Remove a "break". (Danek Duvall)
-rw-r--r--src/json.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/json.c b/src/json.c
index 8d9a03b71..7b85cd251 100644
--- a/src/json.c
+++ b/src/json.c
@@ -272,7 +272,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
break;
#endif
case VAR_UNKNOWN:
- EMSG2(_(e_intern2), "json_encode_item()"); break;
+ EMSG2(_(e_intern2), "json_encode_item()");
return FAIL;
}
return OK;
diff --git a/src/version.c b/src/version.c
index 19cd69cc8..2203948a8 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 */
/**/
+ 1367,
+/**/
1366,
/**/
1365,