diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-11 22:52:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-11 22:52:42 +0200 |
| commit | 0e5d3a2940ead6c8ee3bacacea4153b647b67cca (patch) | |
| tree | a100d3f384274a1c7f7e7190cac79d5af1682208 | |
| parent | c257487035f83aabe1c7e07f0552309e98f1bcb1 (diff) | |
| download | vim-git-0e5d3a2940ead6c8ee3bacacea4153b647b67cca.tar.gz | |
patch 7.4.2198v7.4.2198
Problem: Test alot sometimes fails under valgrind. (Dominique Pelle)
Solution: Avoid passing a callback with the wrong number of arguments.
| -rw-r--r-- | src/testdir/test_partial.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim index 48c7697b4..3e968dabc 100644 --- a/src/testdir/test_partial.vim +++ b/src/testdir/test_partial.vim @@ -260,22 +260,25 @@ func Test_cyclic_dict_arg() unlet Pt endfunc -func Ignored(job1, job2, status) +func Ignored3(job1, job2, status) endfunc func Test_cycle_partial_job() if has('job') let job = job_start('echo') - call job_setoptions(job, {'exit_cb': function('Ignored', [job])}) + call job_setoptions(job, {'exit_cb': function('Ignored3', [job])}) unlet job endif endfunc +func Ignored2(job, status) +endfunc + func Test_ref_job_partial_dict() if has('job') let g:ref_job = job_start('echo') let d = {'a': 'b'} - call job_setoptions(g:ref_job, {'exit_cb': function('string', [], d)}) + call job_setoptions(g:ref_job, {'exit_cb': function('Ignored2', [], d)}) endif endfunc diff --git a/src/version.c b/src/version.c index 5ba3eec7f..4f96443ba 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2198, +/**/ 2197, /**/ 2196, |