From a889cf4642a89537e3eeecf6d30326bf6aa4776f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 19 Mar 2016 13:49:43 +0100 Subject: [PATCH] patch 7.4.1593 Problem: Using channel timeout instead of request timeout. (Coverity) Solution: Remove the extra assignment. --- src/channel.c | 1 - src/version.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) 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, /**/ -- 2.50.1