To: vim_dev@googlegroups.com Subject: Patch 7.4.1811 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1811 Problem: Netbeans channel gets garbage collected. Solution: Set reference in nb_channel. Files: src/eval.c, src/netbeans.c, src/proto/netbeans.pro *** ../vim-7.4.1810/src/eval.c 2016-04-29 22:58:25.618876680 +0200 --- src/eval.c 2016-04-30 17:57:27.996792806 +0200 *************** *** 7025,7030 **** --- 7025,7033 ---- #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) { *** ../vim-7.4.1810/src/netbeans.c 2016-02-27 14:44:21.335585337 +0100 --- src/netbeans.c 2016-04-30 18:06:24.470591520 +0200 *************** *** 2585,2590 **** --- 2585,2607 ---- } } + #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. *** ../vim-7.4.1810/src/proto/netbeans.pro 2016-01-27 21:08:12.527796721 +0100 --- src/proto/netbeans.pro 2016-04-30 17:59:34.775324345 +0200 *************** *** 10,15 **** --- 10,16 ---- 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); *** ../vim-7.4.1810/src/version.c 2016-04-30 17:06:27.167577887 +0200 --- src/version.c 2016-04-30 17:59:48.039170749 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1811, /**/ -- Every exit is an entrance into something else. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///