patch 7.4.1859

Problem:    Cannot use a function reference for "exit_cb".
Solution:   Use get_callback(). (Yegappan Lakshmanan)

diff --git a/src/channel.c b/src/channel.c
index b1f7f1a605dad3b3f29b2027a2a484662afdf432..75cadae7ab33a51a642883cb20dd9b6a5f248d86 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -3839,6 +3839,8 @@ free_job_options(jobopt_T *opt)
        partial_unref(opt->jo_err_partial);
     if (opt->jo_close_partial != NULL)
        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;
                }
            }
+           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)
            {
                if (!(supported & JO_WAITTIME))
@@ -4113,25 +4127,6 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported)
                    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)
            {
                if (!(supported & JO_BLOCK_WRITE))

diff --git a/src/structs.h b/src/structs.h
index d5f8adc83af95984eb46ea682f0f98527084e01b..08d3325431c8ff30db8608f3bf7c87c8b4cb5b9d 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1529,7 +1529,6 @@ typedef struct
     int                jo_id;
     char_u     jo_soe_buf[NUMBUFLEN];
     char_u     *jo_stoponexit;
-    char_u     jo_ecb_buf[NUMBUFLEN];
 } jobopt_T;
 
 

diff --git a/src/version.c b/src/version.c
index 85f57e58b79689ab6d851de24fe93257a62bd178..eb9f2c7112ead56a2fec8f80bd591b7ca6e1da96 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1859,
 /**/
     1858,
 /**/