summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-06 16:38:28 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-06 16:38:28 +0100
commit38fd4bb2842df7634823b99c655b3896a7a2e988 (patch)
tree4b24709eab091051b1967862cc3738ef8f9039f7 /src
parent9ef00be261115acb5bae3b3ca45c1d86a19ba2c7 (diff)
downloadvim-38fd4bb2842df7634823b99c655b3896a7a2e988.zip
patch 7.4.1501
Problem: Garbage collection with an option channel is not tested. Solution: Call garbagecollect() in the test.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_channel.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 3bdfd4cbf..31a4ff6eb 100644
--- 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 106fa2081..0e51caa34 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1501,
+/**/
1500,
/**/
1499,