aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1859

Browse Source 
Problem:    Cannot use a function reference for "exit_cb".
Solution:   Use get_callback(). (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar 2016-05-29 16:44:26 +02:00
parent b127cfd75f
commit ef3abc6442
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/channel.c
View File

@ -3839,6 +3839,8 @@ free_job_options(jobopt_T *opt)
partial_unref(opt->jo_err_partial); partial_unref(opt->jo_err_partial);
if (opt->jo_close_partial != NULL) if (opt->jo_close_partial != NULL)
partial_unref(opt->jo_close_partial); partial_unref(opt->jo_close_partial);
if (opt->jo_exit_partial != NULL)
partial_unref(opt->jo_exit_partial);
} }
/* /*
@ -4051,6 +4053,18 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported)
return FAIL; return FAIL;
} }
} }
else if (STRCMP(hi->hi_key, "exit_cb") == 0)
{
if (!(supported & JO_EXIT_CB))
break;
opt->jo_set |= JO_EXIT_CB;
opt->jo_exit_cb = get_callback(item, &opt->jo_exit_partial);
if (opt->jo_exit_cb == NULL)
{
EMSG2(_(e_invarg2), "exit_cb");
return FAIL;
}
}
else if (STRCMP(hi->hi_key, "waittime") == 0) else if (STRCMP(hi->hi_key, "waittime") == 0)
{ {
if (!(supported & JO_WAITTIME)) if (!(supported & JO_WAITTIME))
@ -4113,25 +4127,6 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported)
return FAIL; return FAIL;
} }
} }
else if (STRCMP(hi->hi_key, "exit_cb") == 0)
{
if (!(supported & JO_EXIT_CB))
break;
opt->jo_set |= JO_EXIT_CB;
if (item->v_type == VAR_PARTIAL && item->vval.v_partial != NULL)
{
opt->jo_exit_partial = item->vval.v_partial;
opt->jo_exit_cb = item->vval.v_partial->pt_name;
}
else
opt->jo_exit_cb = get_tv_string_buf_chk(
item, opt->jo_ecb_buf);
if (opt->jo_exit_cb == NULL)
{
EMSG2(_(e_invarg2), "exit_cb");
return FAIL;
}
}
else if (STRCMP(hi->hi_key, "block_write") == 0) else if (STRCMP(hi->hi_key, "block_write") == 0)
{ {
if (!(supported & JO_BLOCK_WRITE)) if (!(supported & JO_BLOCK_WRITE))

1
src/structs.h
View File

@ -1529,7 +1529,6 @@ typedef struct
int jo_id; int jo_id;
char_u jo_soe_buf[NUMBUFLEN]; char_u jo_soe_buf[NUMBUFLEN];
char_u *jo_stoponexit; char_u *jo_stoponexit;
char_u jo_ecb_buf[NUMBUFLEN];
} jobopt_T; } jobopt_T;

2
src/version.c
View File

@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1859,
/**/ /**/
1858, 1858,
/**/ /**/