From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 19 Feb 2016 21:38:15 +0000 (+0100)
Subject: patch 7.4.1357
X-Git-Tag: v7.4.1357
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=132006c3d0f87dbda5f4d5410fcce312e4716f72;p=thirdparty%2Fvim.git

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 89eab3ce5c..31dff05545 100644
--- 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 c4989426c5..9fb2cdbc8e 100644
--- 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,
 /**/