From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 19 Mar 2016 12:49:43 +0000 (+0100)
Subject: patch 7.4.1593
X-Git-Tag: v7.4.1593
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a889cf4642a89537e3eeecf6d30326bf6aa4776f;p=vim

patch 7.4.1593
Problem:    Using channel timeout instead of request timeout. (Coverity)
Solution:   Remove the extra assignment.
---

diff --git a/src/channel.c b/src/channel.c
index 1f7ad6174..2a71077fd 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2684,7 +2684,6 @@ ch_expr_common(typval_T *argvars, typval_T *rettv, int eval)
 	    timeout = opt.jo_timeout;
 	else
 	    timeout = channel_get_timeout(channel, part_read);
-	timeout = channel_get_timeout(channel, part_read);
 	if (channel_read_json_block(channel, part_read, timeout, id, &listtv)
 									== OK)
 	{
diff --git a/src/version.c b/src/version.c
index 409a9f40b..449c8f24e 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 */
+/**/
+    1593,
 /**/
     1592,
 /**/