From 4cafa6dc7f0728b018979aff0ca039908ecf2ae1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 26 Feb 2016 11:52:39 +0100 Subject: [PATCH] patch 7.4.1423 Problem: Channel test fails on MS-Windows. Solution: Do not give an error message when reading fails, assume the other end exited. --- src/channel.c | 14 +++++--------- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/channel.c b/src/channel.c index 03dbdc3017..9f6cdc7ca6 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1763,10 +1763,13 @@ channel_read(channel_T *channel, int part, char *func) break; /* did read everything that's available */ } - /* Reading a disconnection (readlen == 0), or an error. - * TODO: call error callback. */ + /* Reading a disconnection (readlen == 0), or an error. */ if (readlen <= 0) { + /* Do not give an error message, most likely the other end just + * exited. */ + ch_errors(channel, "%s(): Cannot read from channel", func); + /* Queue a "DETACH" netbeans message in the command queue in order to * terminate the netbeans session later. Do not end the session here * directly as we may be running in the context of a call to @@ -1777,13 +1780,6 @@ channel_read(channel_T *channel, int part, char *func) * -> gui event loop or select loop * -> channel_read() */ - ch_errors(channel, "%s(): Cannot read", func); - if (len < 0) - { - ch_error(channel, "channel_read(): cannot read from channel"); - PERROR(_("E896: read from channel")); - } - msg = channel->ch_part[part].ch_mode == MODE_RAW || channel->ch_part[part].ch_mode == MODE_NL ? DETACH_MSG_RAW : DETACH_MSG_JSON; diff --git a/src/version.c b/src/version.c index 08c8c1a8ed..5e246f9dd4 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 */ +/**/ + 1423, /**/ 1422, /**/