To: vim_dev@googlegroups.com Subject: Patch 7.4.1635 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1635 Problem: Channel test is a bit flaky. Solution: Remove 'DETACH' if it's there. Files: src/test_channel.vim *** ../vim-7.4.1634/src/testdir/test_channel.vim 2016-03-20 22:16:52.660922719 +0100 --- src/testdir/test_channel.vim 2016-03-21 23:12:26.513356568 +0100 *************** *** 685,690 **** --- 685,693 ---- call ch_sendraw(handle, "quit\n") sp pipe-output call s:waitFor('line("$") >= 6') + if getline('$') == 'DETACH' + $del + endif call assert_equal([firstline, 'line one', 'line two', 'this', 'AND this', 'Goodbye!'], getline(1, '$')) bwipe! finally *** ../vim-7.4.1634/src/version.c 2016-03-21 23:13:28.436710433 +0100 --- src/version.c 2016-03-21 23:18:35.845503235 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1635, /**/ -- # echo reboot >universe # chmod +x universe # ./universe /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///