# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1503151204 -7200
# Node ID 51e5a8602624b0c735908602c34c359ccacab04a
# Parent  917ae89c1f9d17d72f023f610ef59c2753caf2f4
patch 8.0.0964: channel write buffer does not work with poll()

commit https://github.com/vim/vim/commit/683b7967253ecd44476a5a01d857271c0d3ff4f4
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Aug 19 15:51:59 2017 +0200

    patch 8.0.0964: channel write buffer does not work with poll()

    Problem:    Channel write buffer does not work with poll().
    Solution:   Use the same mechanism as with select().

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -3018,7 +3018,9 @@ channel_fill_poll_write(int nfd_in, stru
     {
 	chanpart_T  *in_part = &ch->ch_part[PART_IN];
 
-	if (in_part->ch_fd != INVALID_FD && in_part->ch_bufref.br_buf != NULL)
+	if (in_part->ch_fd != INVALID_FD
+		&& (in_part->ch_bufref.br_buf != NULL
+		    || in_part->ch_writeque.wq_next != NULL))
 	{
 	    in_part->ch_poll_idx = nfd;
 	    fds[nfd].fd = in_part->ch_fd;
@@ -3946,13 +3948,7 @@ channel_poll_check(int ret_in, void *fds
 	idx = in_part->ch_poll_idx;
 	if (ret > 0 && idx != -1 && (fds[idx].revents & POLLOUT))
 	{
-	    if (in_part->ch_buf_append)
-	    {
-		if (in_part->ch_bufref.br_buf != NULL)
-		    channel_write_new_lines(in_part->ch_bufref.br_buf);
-	    }
-	    else
-		channel_write_in(channel);
+	    channel_write_input(channel);
 	    --ret;
 	}
     }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    964,
+/**/
     963,
 /**/
     962,