aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 7.4.1423

Browse Source 
Problem:    Channel test fails on MS-Windows.
Solution:   Do not give an error message when reading fails, assume the other
            end exited.
This commit is contained in:
Bram Moolenaar
2016-02-26 11:52:39 +01:00
parent 46c85439c9
commit 4cafa6dc7f
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/channel.c
View File

@@ -1763,10 +1763,13 @@ channel_read(channel_T *channel, int part, char *func)
break; /* did read everything that's available */ break; /* did read everything that's available */
} }
/* Reading a disconnection (readlen == 0), or an error. /* Reading a disconnection (readlen == 0), or an error. */
* TODO: call error callback. */
if (readlen <= 0) 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 /* Queue a "DETACH" netbeans message in the command queue in order to
* terminate the netbeans session later. Do not end the session here * terminate the netbeans session later. Do not end the session here
* directly as we may be running in the context of a call to * 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 * -> gui event loop or select loop
* -> channel_read() * -> 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 msg = channel->ch_part[part].ch_mode == MODE_RAW
|| channel->ch_part[part].ch_mode == MODE_NL || channel->ch_part[part].ch_mode == MODE_NL
? DETACH_MSG_RAW : DETACH_MSG_JSON; ? DETACH_MSG_RAW : DETACH_MSG_JSON;

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1423,
/**/ /**/
1422, 1422,
/**/ /**/