patch 7.4.1357

Problem:    Error for returning value from void function.
Solution:   Don't do that.

diff --git a/src/eval.c b/src/eval.c
index 89eab3ce5cf487c31a9cbb42a92d923512ab35dc..31dff055451c48a2665435bcffeee2ee5d77c58a 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -10236,7 +10236,7 @@ f_ch_setoptions(typval_T *argvars, typval_T *rettv UNUSED)
     if (channel == NULL)
        return;
     if (get_job_options(&argvars[1], &opt, JO_CALLBACK + JO_TIMEOUT) == FAIL)
-       return NULL;
+       return;
     channel_set_options(channel, &opt);
 }
 

diff --git a/src/version.c b/src/version.c
index c4989426c53e6ac4a25c1e3dc76e410567178f29..9fb2cdbc8e775e78f272f7fbbc0cf5b3f1f80383 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1357,
 /**/
     1356,
 /**/