Mercurial > vim
changeset 8261:a412b466bedc v7.4.1423
commit https://github.com/vim/vim/commit/4cafa6dc7f0728b018979aff0ca039908ecf2ae1
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 26 11:52:39 2016 +0100
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 26 Feb 2016 12:00:05 +0100 |
parents | a61da15cb3f3 |
children | 9603b24722e5 |
files | src/channel.c src/version.c |
diffstat | 2 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -1763,10 +1763,13 @@ channel_read(channel_T *channel, int par 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 par * -> 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;