summaryrefslogtreecommitdiff
path: root/src/version.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-06 21:56:09 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-06 21:56:09 +0100
commit88989cc381c764978f7d7c8e387f3efc21333b4b (patch)
tree6e21020d48604772c0e4ea94d690f9f569dc9557 /src/version.c
parent544d3bc9f0e494cb712a33b61558b8e8e12b1e0b (diff)
downloadvim-88989cc381c764978f7d7c8e387f3efc21333b4b.zip
patch 8.0.0312: failure when a channel receives a split json message
Problem: When a json message arrives in pieces, the start is dropped and the decoding fails. Solution: Do not drop the start when it is still needed. (Kay Zheng) Add a test. Reset the timeout when something is received.
Diffstat (limited to 'src/version.c')
-rw-r--r--src/version.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index 72d17994f..22e26698f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 312,
+/**/
311,
/**/
310,