To: vim_dev@googlegroups.com Subject: Patch 7.4.1825 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1825 Problem: When job writes to buffer nothing is written. (Nicola) Solution: Do not discard a channel before writing is done. Files: src/channel.c *** ../vim-7.4.1824/src/channel.c 2016-05-08 13:21:06.652079471 +0200 --- src/channel.c 2016-05-08 21:42:22.915705324 +0200 *************** *** 352,357 **** --- 352,361 ---- if (channel->ch_close_cb != NULL) return TRUE; + /* If reading from or a buffer it's still useful. */ + if (channel->ch_part[PART_IN].ch_buffer != NULL) + return TRUE; + /* If there is no callback then nobody can get readahead. If the fd is * closed and there is no readahead then the callback won't be called. */ has_sock_msg = channel->ch_part[PART_SOCK].ch_fd != INVALID_FD *************** *** 365,372 **** || channel->ch_part[PART_ERR].ch_json_head.jq_next != NULL; return (channel->ch_callback != NULL && (has_sock_msg || has_out_msg || has_err_msg)) ! || (channel->ch_part[PART_OUT].ch_callback != NULL && has_out_msg) ! || (channel->ch_part[PART_ERR].ch_callback != NULL && has_err_msg); } /* --- 369,378 ---- || channel->ch_part[PART_ERR].ch_json_head.jq_next != NULL; return (channel->ch_callback != NULL && (has_sock_msg || has_out_msg || has_err_msg)) ! || ((channel->ch_part[PART_OUT].ch_callback != NULL ! || channel->ch_part[PART_OUT].ch_buffer) && has_out_msg) ! || ((channel->ch_part[PART_ERR].ch_callback != NULL ! || channel->ch_part[PART_ERR].ch_buffer) && has_err_msg); } /* *** ../vim-7.4.1824/src/version.c 2016-05-08 13:21:06.656079425 +0200 --- src/version.c 2016-05-08 21:44:11.758505509 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1825, /**/ -- How come wrong numbers are never busy? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///