projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 05649561 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.236 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.2.236 | |
| 11 | Problem: Using gvim with Agide gives "connection lost" error messages. | |
| 12 | Solution: Only give the "connection lost" message when the buffer was once | |
| 13 | owned by NetBeans. | |
| 14 | Files: src/netbeans.c, src/structs.h | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.235/src/netbeans.c Mon Feb 2 13:02:59 2004 | |
| 18 | --- src/netbeans.c Thu Feb 5 11:23:51 2004 | |
| 19 | *************** | |
| 20 | *** 1517,1523 **** | |
| 21 | return FAIL; | |
| 22 | } | |
| 23 | buf->fireChanges = 0; | |
| 24 | ! if (buf->bufp != NULL && !buf->bufp->b_netbeans_file) | |
| 25 | EMSGN(_("E658: NetBeans connection lost for buffer %ld"), | |
| 26 | buf->bufp->b_fnum); | |
| 27 | /* =====================================================================*/ | |
| 28 | --- 1517,1525 ---- | |
| 29 | return FAIL; | |
| 30 | } | |
| 31 | buf->fireChanges = 0; | |
| 32 | ! if (buf->bufp != NULL | |
| 33 | ! && buf->bufp->b_was_netbeans_file | |
| 34 | ! && !buf->bufp->b_netbeans_file) | |
| 35 | EMSGN(_("E658: NetBeans connection lost for buffer %ld"), | |
| 36 | buf->bufp->b_fnum); | |
| 37 | /* =====================================================================*/ | |
| 38 | *************** | |
| 39 | *** 2077,2083 **** | |
| 40 | nbdebug((" null bufp in %s command", cmd)); | |
| 41 | return FAIL; | |
| 42 | } | |
| 43 | ! buf->bufp->b_netbeans_file = *args == 'T' ? TRUE : FALSE; | |
| 44 | /* =====================================================================*/ | |
| 45 | } | |
| 46 | else if (streq((char *)cmd, "version")) | |
| 47 | --- 2079,2091 ---- | |
| 48 | nbdebug((" null bufp in %s command", cmd)); | |
| 49 | return FAIL; | |
| 50 | } | |
| 51 | ! if (*args == 'T') | |
| 52 | ! { | |
| 53 | ! buf->bufp->b_netbeans_file = TRUE; | |
| 54 | ! buf->bufp->b_was_netbeans_file = TRUE; | |
| 55 | ! } | |
| 56 | ! else | |
| 57 | ! buf->bufp->b_netbeans_file = FALSE; | |
| 58 | /* =====================================================================*/ | |
| 59 | } | |
| 60 | else if (streq((char *)cmd, "version")) | |
| 61 | *** ../vim-6.2.235/src/structs.h Sun Jan 18 21:31:56 2004 | |
| 62 | --- src/structs.h Wed Feb 4 19:50:49 2004 | |
| 63 | *************** | |
| 64 | *** 1235,1240 **** | |
| 65 | --- 1235,1241 ---- | |
| 66 | ||
| 67 | #ifdef FEAT_NETBEANS_INTG | |
| 68 | int b_netbeans_file; /* TRUE when buffer is owned by NetBeans */ | |
| 69 | + int b_was_netbeans_file;/* TRUE if b_netbeans_file was once set */ | |
| 70 | #endif | |
| 71 | ||
| 72 | }; | |
| 73 | *** ../vim-6.2.235/src/version.c Wed Feb 4 21:44:27 2004 | |
| 74 | --- src/version.c Thu Feb 5 12:06:30 2004 | |
| 75 | *************** | |
| 76 | *** 639,640 **** | |
| 77 | --- 639,642 ---- | |
| 78 | { /* Add new patch number below this line */ | |
| 79 | + /**/ | |
| 80 | + 236, | |
| 81 | /**/ | |
| 82 | ||
| 83 | -- | |
| 84 | George: "I just got a new set of golf clubs for my wife!" | |
| 85 | John: "Great trade!" | |
| 86 | ||
| 87 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 88 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 89 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 90 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |