diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-19 22:38:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-19 22:38:15 +0100 |
| commit | 132006c3d0f87dbda5f4d5410fcce312e4716f72 (patch) | |
| tree | bafbd703d131e98c6e9123a310f16b7b69c0d279 | |
| parent | 40ea1da14ba196a23309789852e1b663fd92e3a8 (diff) | |
| download | vim-git-132006c3d0f87dbda5f4d5410fcce312e4716f72.tar.gz | |
patch 7.4.1357v7.4.1357
Problem: Error for returning value from void function.
Solution: Don't do that.
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 89eab3ce5..31dff0554 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 c4989426c..9fb2cdbc8 100644 --- 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, |