patch 7.4.1501

Problem:    Garbage collection with an option channel is not tested.
Solution:   Call garbagecollect() in the test.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 3bdfd4cbf8cdc8a298b55db7c617788fa1cc5eb9..31a4ff6eb29730c496a0f0fa4407e8cbf71ffe51 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -146,6 +146,9 @@ func s:communicate(port)
   endif
   call assert_equal('got it', s:responseMsg)
 
+  " Collect garbage, tests that our handle isn't collected.
+  call garbagecollect()
+
   " check setting options (without testing the effect)
   call ch_setoptions(handle, {'callback': 's:NotUsed'})
   call ch_setoptions(handle, {'timeout': 1111})

diff --git a/src/version.c b/src/version.c
index 106fa20819baab0cbee39a3ca7f9c8b2ff055110..0e51caa34af1559e34d790d7b78a458226a4c277 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1501,
 /**/
     1500,
 /**/