Mercurial > vim

changeset 8126:0aa9cb77a8dd v7.4.1357

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Fri, 19 Feb 2016 22:45:05 +0100
parents 66c86117699a
children e40404256a23
files src/eval.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }
 
--- 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,