changeset 10253:a92c4abb8c1f v8.0.0024

commit https://github.com/vim/vim/commit/8ddef48d1eade1911b946fdda8c73c80856e6273 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sun, 09 Oct 2016 15:45:03 +0200
parents dfabecac3c48
children adc9fb6a6631
files src/channel.c src/testdir/test_netbeans.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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])
--- 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,