# HG changeset patch # User Christian Brabandt # Date 1458392404 -3600 # Node ID d762390fb27b9e2b17ae528817115dc6fafb49a2 # Parent 93cd67687c8830fa2dfd2accf10ce0084bfcb000 commit https://github.com/vim/vim/commit/a889cf4642a89537e3eeecf6d30326bf6aa4776f Author: Bram Moolenaar Date: Sat Mar 19 13:49:43 2016 +0100 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 --- a/src/channel.c +++ b/src/channel.c @@ -2684,7 +2684,6 @@ ch_expr_common(typval_T *argvars, typval 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 --- 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 */ /**/ + 1593, +/**/ 1592, /**/ 1591,