summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-14 23:27:29 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-14 23:27:29 +0100
commit39afdea2035c34239910267978538a3c99b66911 (patch)
tree104fbfe83d8f3048eba49f48cff783fbcba1ca53
parentd6c2f0526064eef6f8917d2bad00df707d79ea16 (diff)
patch 7.4.1561v7.4.1561
Problem: Missing update to proto file. Solution: Change the proto file.
-rw-r--r--src/proto/channel.pro2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/proto/channel.pro b/src/proto/channel.pro
index eb50b2f3bd..be11a3ad20 100644
--- a/src/proto/channel.pro
+++ b/src/proto/channel.pro
@@ -12,7 +12,7 @@ channel_T *channel_open_func(typval_T *argvars);
void channel_set_pipes(channel_T *channel, sock_T in, sock_T out, sock_T err);
void channel_set_job(channel_T *channel, job_T *job, jobopt_T *options);
void channel_set_options(channel_T *channel, jobopt_T *opt);
-void channel_set_req_callback(channel_T *channel, int part, char_u *callback, int id);
+void channel_set_req_callback(channel_T *channel, int part, char_u *callback, partial_T *partial, int id);
void channel_write_in(channel_T *channel);
void channel_write_new_lines(buf_T *buf);
char_u *channel_get(channel_T *channel, int part);
diff --git a/src/version.c b/src/version.c
index 52e2b802cd..501287d9da 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1561,
+/**/
1560,
/**/
1559,