aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.2-079

Browse Source
This commit is contained in:
Bram Moolenaar
2009-01-06 15:14:30 +00:00
parent 238b8e20bb
commit d7f8f5c847
6 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/buffer.c
View File

@@ -437,10 +437,6 @@ close_buffer(win, buf, action)
return;
#endif
#ifdef FEAT_NETBEANS_INTG
if (usingNetbeans)
netbeans_file_closed(buf);
#endif
/* Change directories when the 'acd' option is set. */
DO_AUTOCHDIR
@@ -639,6 +635,10 @@ free_buffer_stuff(buf, free_options)
#ifdef FEAT_SIGNS
buf_delete_signs(buf); /* delete any signs */
#endif
#ifdef FEAT_NETBEANS_INTG
if (usingNetbeans)
netbeans_file_killed(buf);
#endif
#ifdef FEAT_LOCALMAP
map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */
map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */
@@ -815,9 +815,6 @@ do_bufdel(command, arg, addr_count, start_bnr, end_bnr, forceit)
int bnr; /* buffer number */
char_u *p;
#ifdef FEAT_NETBEANS_INTG
netbeansCloseFile = 1;
#endif
if (addr_count == 0)
{
(void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
@@ -912,9 +909,6 @@ do_bufdel(command, arg, addr_count, start_bnr, end_bnr, forceit)
}
}
#ifdef FEAT_NETBEANS_INTG
netbeansCloseFile = 0;
#endif
return errormsg;
}

1
src/globals.h
View File

@@ -1340,7 +1340,6 @@ EXTERN garray_T error_ga
#ifdef FEAT_NETBEANS_INTG
EXTERN char *netbeansArg INIT(= NULL); /* the -nb[:host:port:passwd] arg */
EXTERN int netbeansCloseFile INIT(= 0); /* send killed if != 0 */
EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */

30
src/netbeans.c
View File

@@ -2921,44 +2921,26 @@ netbeans_file_opened(buf_T *bufp)
}
/*
* Tell netbeans a file was closed.
* Tell netbeans that a file was deleted or wiped out.
*/
void
netbeans_file_closed(buf_T *bufp)
netbeans_file_killed(buf_T *bufp)
{
int bufno = nb_getbufno(bufp);
nbbuf_T *nbbuf = nb_get_buf(bufno);
char buffer[2*MAXPATHL];
if (!haveConnection || bufno < 0)
if (!haveConnection || bufno == -1)
return;
if (!netbeansCloseFile)
{
nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
bufp->b_ffname));
return;
}
nbdebug(("netbeans_file_closed:\n"));
nbdebug((" Closing bufno: %d", bufno));
if (curbuf != NULL && curbuf != bufp)
{
nbdebug((" Curbuf bufno: %d\n", nb_getbufno(curbuf)));
}
else if (curbuf == bufp)
{
nbdebug((" curbuf == bufp\n"));
}
if (bufno <= 0)
return;
nbdebug(("netbeans_file_killed:\n"));
nbdebug((" Killing bufno: %d", bufno));
sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
nbdebug(("EVT: %s", buffer));
nb_send(buffer, "netbeans_file_closed");
nb_send(buffer, "netbeans_file_killed");
if (nbbuf != NULL)
nbbuf->bufp = NULL;

2
src/proto/netbeans.pro
View File

@@ -11,7 +11,7 @@ void netbeans_send_disconnect __ARGS((void));
void netbeans_frame_moved __ARGS((int new_x, int new_y));
void netbeans_file_activated __ARGS((buf_T *bufp));
void netbeans_file_opened __ARGS((buf_T *bufp));
void netbeans_file_closed __ARGS((buf_T *bufp));
void netbeans_file_killed __ARGS((buf_T *bufp));
void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
void netbeans_unmodified __ARGS((buf_T *bufp));

2
src/version.c
View File

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