summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.vim3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 16fe5c782..c98f5bd68 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1158,9 +1158,8 @@ func Test_out_cb()
call WaitForAssert({-> assert_equal("dict: there", g:Ch_errmsg)})
" Receive a json object split in pieces
- unlet! g:Ch_outobj
- call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
let g:Ch_outobj = ''
+ call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)})
finally
call job_stop(job)
diff --git a/src/version.c b/src/version.c
index b76a35414..d74b0fa78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 278,
+/**/
277,
/**/
276,