Mercurial > vim

changeset 8607:d762390fb27b v7.4.1593

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/a889cf4642a89537e3eeecf6d30326bf6aa4776f Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Mar 2016 14:00:04 +0100
parents 93cd67687c88
children 74893ef07db0
files src/channel.c src/version.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
 	{
--- 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,