Skip to content

Commit 8ddef48

Browse files
committed
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.
1 parent 226630a commit 8ddef48

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

src/channel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3061,7 +3061,7 @@ channel_close_on_error(channel_T *channel, char *func)
30613061
* Only send "DETACH" for a netbeans channel.
30623062
*/
30633063
if (channel->ch_nb_close_cb != NULL)
3064-
channel_save(channel, PART_OUT, (char_u *)DETACH_MSG_RAW,
3064+
channel_save(channel, PART_SOCK, (char_u *)DETACH_MSG_RAW,
30653065
(int)STRLEN(DETACH_MSG_RAW), FALSE, "PUT ");
30663066

30673067
/* When reading from stdout is not possible, assume the other side has

src/testdir/test_netbeans.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func Nb_basic(port)
3535
nbclose
3636

3737
call WaitFor('len(readfile("Xnetbeans")) > 6')
38+
call assert_false(has("netbeans_enabled"))
3839
let lines = readfile("Xnetbeans")
3940
call assert_equal('AUTH bunny', lines[0])
4041
call assert_equal('0:version=0 "2.5"', lines[1])

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
24,
767769
/**/
768770
23,
769771
/**/

0 commit comments

Comments
 (0)