# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455918305 -3600
# Node ID 0aa9cb77a8dd5bcd9b623e1edf492de88d8aad80
# Parent  66c86117699a5f2a7d83dfc832bebd84d4486303
commit https://github.com/vim/vim/commit/132006c3d0f87dbda5f4d5410fcce312e4716f72
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Feb 19 22:38:15 2016 +0100

    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
--- a/src/eval.c
+++ b/src/eval.c
@@ -10236,7 +10236,7 @@ f_ch_setoptions(typval_T *argvars, typva
     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
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1357,
+/**/
     1356,
 /**/
     1355,