# HG changeset patch # User Christian Brabandt # Date 1476020703 -7200 # Node ID a92c4abb8c1f8c3ec337ce4635cf4ad14232c1da # Parent dfabecac3c481204736b21d5e2e2e7fe13afb7a9 commit https://github.com/vim/vim/commit/8ddef48d1eade1911b946fdda8c73c80856e6273 Author: Bram Moolenaar Date: Sun Oct 9 15:43:25 2016 +0200 patch 8.0.0024 Problem: When the netbeans channel closes, "DETACH" is put in the output part. (Ozaki Kiichi) Solution: Write "DETACH" in the socket part. diff --git a/src/channel.c b/src/channel.c --- a/src/channel.c +++ b/src/channel.c @@ -3061,7 +3061,7 @@ channel_close_on_error(channel_T *channe * Only send "DETACH" for a netbeans channel. */ if (channel->ch_nb_close_cb != NULL) - channel_save(channel, PART_OUT, (char_u *)DETACH_MSG_RAW, + channel_save(channel, PART_SOCK, (char_u *)DETACH_MSG_RAW, (int)STRLEN(DETACH_MSG_RAW), FALSE, "PUT "); /* When reading from stdout is not possible, assume the other side has diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim --- a/src/testdir/test_netbeans.vim +++ b/src/testdir/test_netbeans.vim @@ -35,6 +35,7 @@ func Nb_basic(port) nbclose call WaitFor('len(readfile("Xnetbeans")) > 6') + call assert_false(has("netbeans_enabled")) let lines = readfile("Xnetbeans") call assert_equal('AUTH bunny', lines[0]) call assert_equal('0:version=0 "2.5"', lines[1]) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 24, +/**/ 23, /**/ 22,