patch 7.4.1357

brammool · brammool · commit 132006c3d0f8 · 2016-02-19T22:38:15.000+01:00
Problem:    Error for returning value from void function.
Solution:   Don't do that.
diff --git 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
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1357,
 /**/
     1356,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -10236,7 +10236,7 @@ f_ch_setoptions(typval_T argvars, typval_T rettv UNUSED)`
`10236`	`10236`	`if (channel == NULL)`
`10237`	`10237`	`return;`
`10238`	`10238`	`if (get_job_options(&argvars[1], &opt, JO_CALLBACK + JO_TIMEOUT) == FAIL)`
`10239`		`- return NULL;`
	`10239`	`+ return;`
`10240`	`10240`	`channel_set_options(channel, &opt);`
`10241`	`10241`	`}`
`10242`	`10242`