diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-02-20 18:18:59 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-02-20 18:18:59 +0100 |
commit | 42d38a2db17e70312d073095257555c27a5f9443 (patch) | |
tree | fcb13b0302206de82ac486810cdd0c033f4cece7 /src/netbeans.c | |
parent | 914331648dc3609ca9f6954f4019497e5fb3274e (diff) | |
download | vim-git-42d38a2db17e70312d073095257555c27a5f9443.tar.gz |
patch 7.4.1369v7.4.1369
Problem: Channels don't have a queue for stderr.
Solution: Have a queue for each part of the channel.
Diffstat (limited to 'src/netbeans.c')
-rw-r--r-- | src/netbeans.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/netbeans.c b/src/netbeans.c index 4b56cf8db..55169ea2a 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -385,7 +385,7 @@ netbeans_parse_messages(void) while (nb_channel != NULL) { - buffer = channel_peek(nb_channel); + buffer = channel_peek(nb_channel, PART_SOCK); if (buffer == NULL) break; /* nothing to read */ @@ -396,7 +396,7 @@ netbeans_parse_messages(void) /* Command isn't complete. If there is no following buffer, * return (wait for more). If there is another buffer following, * prepend the text to that buffer and delete this one. */ - if (channel_collapse(nb_channel) == FAIL) + if (channel_collapse(nb_channel, PART_SOCK) == FAIL) return; } else @@ -409,7 +409,7 @@ netbeans_parse_messages(void) if (*p == NUL) { own_node = TRUE; - channel_get(nb_channel); + channel_get(nb_channel, PART_SOCK); } else own_node = FALSE; @@ -757,7 +757,7 @@ netbeans_end(void) nb_send(char *buf, char *fun) { if (nb_channel != NULL) - channel_send(nb_channel, (char_u *)buf, fun); + channel_send(nb_channel, PART_SOCK, (char_u *)buf, fun); } /* |