# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472232605 -7200
# Node ID 01c3f981ce081366e6714797c32cdc9cf1ae6d62
# Parent  e8db856a5c743b01c79cae0152e9506c9e0fb825
commit https://github.com/vim/vim/commit/dd74ab9b464f3d1a5f6f6395469b76f8e0e6dccd
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Aug 26 19:20:26 2016 +0200

    patch 7.4.2260
    Problem:    Channel test is flaky.
    Solution:   Add a newline to separate JSON messages.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -368,11 +368,11 @@ func Ch_raw_one_time_callback(port)
   call ch_setoptions(handle, {'mode': 'raw'})
 
   " The message are sent raw, we do our own JSON strings here.
-  call ch_sendraw(handle, "[1, \"hello!\"]", {'callback': 'Ch_handleRaw1'})
+  call ch_sendraw(handle, "[1, \"hello!\"]\n", {'callback': 'Ch_handleRaw1'})
   call WaitFor('g:Ch_reply1 != ""')
   call assert_equal("[1, \"got it\"]", g:Ch_reply1)
-  call ch_sendraw(handle, "[2, \"echo something\"]", {'callback': 'Ch_handleRaw2'})
-  call ch_sendraw(handle, "[3, \"wait a bit\"]", {'callback': 'Ch_handleRaw3'})
+  call ch_sendraw(handle, "[2, \"echo something\"]\n", {'callback': 'Ch_handleRaw2'})
+  call ch_sendraw(handle, "[3, \"wait a bit\"]\n", {'callback': 'Ch_handleRaw3'})
   call WaitFor('g:Ch_reply2 != ""')
   call assert_equal("[2, \"something\"]", g:Ch_reply2)
   " wait for the 200 msec delayed reply
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    2260,
+/**/
     2259,
 /**/
     2258,