diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-07 22:16:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-07 22:16:36 +0200 |
| commit | 5f1032d2a55b9417a0a6fa225e35089c98a5a419 (patch) | |
| tree | 5a44e80e39eba782524fdb963604cbadf7e73bf6 /src/proto/channel.pro | |
| parent | fdd82fe365d0e287bafc71f98c039cb5af8ed827 (diff) | |
| download | vim-git-5f1032d2a55b9417a0a6fa225e35089c98a5a419.tar.gz | |
patch 7.4.1906v7.4.1906
Problem: Collapsing channel buffers and searching for NL does not work
properly. (Xavier de Gary, Ramel Eshed)
Solution: Do not assume the buffer contains a NUL or not. Change NUL bytes
to NL to avoid the string is truncated.
Diffstat (limited to 'src/proto/channel.pro')
| -rw-r--r-- | src/proto/channel.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/proto/channel.pro b/src/proto/channel.pro index 52bced3b9..8a059a3a9 100644 --- a/src/proto/channel.pro +++ b/src/proto/channel.pro @@ -17,14 +17,16 @@ void channel_set_req_callback(channel_T *channel, int part, char_u *callback, pa void channel_buffer_free(buf_T *buf); void channel_write_any_lines(void); void channel_write_new_lines(buf_T *buf); +readq_T *channel_peek(channel_T *channel, int part); +char_u *channel_first_nl(readq_T *node); char_u *channel_get(channel_T *channel, int part); +void channel_consume(channel_T *channel, int part, int len); int channel_collapse(channel_T *channel, int part, int want_nl); int channel_can_write_to(channel_T *channel); int channel_is_open(channel_T *channel); char *channel_status(channel_T *channel); void channel_info(channel_T *channel, dict_T *dict); void channel_close(channel_T *channel, int invoke_close_cb); -char_u *channel_peek(channel_T *channel, int part); void channel_clear(channel_T *channel); void channel_free_all(void); char_u *channel_read_block(channel_T *channel, int part, int timeout); |