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
index d4ec60b75e382a92edb7100f96ac65d6267555a1..ba6e7ec955abda956ad83c2deea37838a3d35b1a 100644 (file)
--- 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 77fc2bcad70a03a5d0de12e436583b4409b624cc..7bffeb215ad4e271c7d0f088c226f41701bb97c1 100644 (file)
--- 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 5bb9a1492ce1b8aeb409ef18dba4366ce699e972..78f5264ccc364e0d050bbb390b41f14f4b68a567 100644 (file)
--- 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 */
+/**/
+    24,
 /**/
     23,
 /**/