From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 11 Aug 2016 20:52:42 +0000 (+0200)
Subject: patch 7.4.2198
X-Git-Tag: v7.4.2198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e5d3a2940ead6c8ee3bacacea4153b647b67cca;p=vim

patch 7.4.2198
Problem:    Test alot sometimes fails under valgrind. (Dominique Pelle)
Solution:   Avoid passing a callback with the wrong number of arguments.
---

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
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2198,
 /**/
     2197,
 /**/