0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

patch 7.4.1811

Problem:    Netbeans channel gets garbage collected.
Solution:   Set reference in nb_channel.
This commit is contained in:
Bram Moolenaar
2016-04-30 18:07:05 +02:00
parent 715d285d79
commit 3266c85a44
4 changed files with 23 additions and 0 deletions

View File

@@ -7025,6 +7025,9 @@ garbage_collect(int testing)
#ifdef FEAT_JOB_CHANNEL
abort = abort || set_ref_in_channel(copyID);
#endif
#ifdef FEAT_NETBEANS_INTG
abort = abort || set_ref_in_nb_channel(copyID);
#endif
if (!abort)
{

View File

@@ -2585,6 +2585,23 @@ netbeans_send_disconnect(void)
}
}
#if defined(FEAT_EVAL) || defined(PROTO)
int
set_ref_in_nb_channel(int copyID)
{
int abort = FALSE;
typval_T tv;
if (nb_channel != NULL)
{
tv.v_type = VAR_CHANNEL;
tv.vval.v_channel = nb_channel;
abort = set_ref_in_item(&tv, copyID, NULL, NULL);
}
return abort;
}
#endif
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO)
/*
* Tell netbeans that the window was moved or resized.

View File

@@ -10,6 +10,7 @@ void netbeans_beval_cb(BalloonEval *beval, int state);
int netbeans_active(void);
void netbeans_open(char *params, int doabort);
void netbeans_send_disconnect(void);
int set_ref_in_nb_channel(int copyID);
void netbeans_frame_moved(int new_x, int new_y);
void netbeans_file_activated(buf_T *bufp);
void netbeans_file_opened(buf_T *bufp);

View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1811,
/**/
1810,
/**/