diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-10-09 15:43:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-10-09 15:43:25 +0200 |
| commit | 8ddef48d1eade1911b946fdda8c73c80856e6273 (patch) | |
| tree | 16ce889f491c643e75fe28870e049a181ac3b57e | |
| parent | 226630a030c0d41145e1109f09633360fc9c999d (diff) | |
patch 8.0.0024v8.0.0024
Problem: When the netbeans channel closes, "DETACH" is put in the output
part. (Ozaki Kiichi)
Solution: Write "DETACH" in the socket part.
| -rw-r--r-- | src/channel.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_netbeans.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c index d4ec60b75e..ba6e7ec955 100644 --- a/src/channel.c +++ b/src/channel.c @@ -3061,7 +3061,7 @@ channel_close_on_error(channel_T *channel, char *func) * 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 index 77fc2bcad7..7bffeb215a 100644 --- 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 index 5bb9a1492c..78f5264ccc 100644 --- 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, |