adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.0020

Browse Source
This commit is contained in:
Bram Moolenaar
2004-10-24 19:23:07 +00:00
parent 009b2592f7
commit 35a9aaab4a
11 changed files with 246 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eval.c
View File

@ -5570,6 +5570,10 @@ f_has(argvars, retvar)
#if defined(WIN3264)
else if (STRICMP(name, "win95") == 0)
n = mch_windows95();
#endif
#ifdef FEAT_NETBEANS_INTG
else if (STRICMP(name, "netbeans_enabled") == 0)
n = usingNetbeans;
#endif
}

4
src/ex_cmds.c
View File

@ -3208,8 +3208,8 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
workshop_file_opened((char *)curbuf->b_ffname, curbuf->b_p_ro);
# endif
# ifdef FEAT_NETBEANS_INTG
if (usingNetbeans)
netbeans_file_opened((char *)curbuf->b_ffname);
if (usingNetbeans & ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
netbeans_file_opened(curbuf);
# endif
}
#endif

2
src/ex_cmds.h
View File

@ -524,6 +524,8 @@ EX(CMD_mzfile, "mzfile", ex_mzfile,
RANGE|FILE1|NEEDARG|CMDWIN),
EX(CMD_next, "next", ex_next,
RANGE|NOTADR|BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_nbkey, "nbkey", ex_nbkey,
EXTRA|NOTADR|NEEDARG),
EX(CMD_new, "new", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_nmap, "nmap", ex_map,

5
src/gui_gtk_x11.c
View File

@ -3309,11 +3309,6 @@ gui_mch_init(void)
/* Pretend we don't have input focus, we will get an event if we do. */
gui.in_focus = FALSE;
#ifdef FEAT_NETBEANS_INTG
if (usingNetbeans)
netbeans_gtk_connect();
# endif
return OK;
}

4
src/gui_x11.c
View File

@ -1540,10 +1540,6 @@ gui_mch_init()
if (usingSunWorkShop)
workshop_connect(app_context);
#endif
#ifdef FEAT_NETBEANS_INTG
if (usingNetbeans)
netbeans_Xt_connect(app_context);
#endif
#ifdef FEAT_BEVAL
gui_init_tooltip_font();

14
src/main.c
View File

@ -1255,6 +1255,20 @@ scripterror:
#endif
)
{
#ifdef NBDEBUG
/*
* This shouldn't be necessary. But if I run netbeans with the log
* output coming to the console and XOpenDisplay fails, I get vim
* trying to start with input/output to my console tty. This fills my
* input buffer so fast I can't even kill the process in under 2
* minutes (and it beeps continuosly the whole time :-)
*/
if (usingNetbeans && (!stdout_isatty || !input_isatty))
{
mch_errmsg(_("Vim: Error: Failure to start gvim from NetBeans\n"));
exit(1);
}
#endif
if (!stdout_isatty)
mch_errmsg(_("Vim: Warning: Output is not to a terminal\n"));
if (!input_isatty)

8
src/memline.c
View File

@ -2462,8 +2462,8 @@ ml_append_int(buf, lnum, line, len, newfile, mark)
if (usingNetbeans)
{
if (STRLEN(line) > 0)
netbeans_inserted(buf, lnum+1, (colnr_T)0, 0, line, STRLEN(line));
netbeans_inserted(buf, lnum+1, (colnr_T)STRLEN(line), 0,
netbeans_inserted(buf, lnum+1, (colnr_T)0, line, STRLEN(line));
netbeans_inserted(buf, lnum+1, (colnr_T)STRLEN(line),
(char_u *)"\n", 1);
}
#endif
@ -2500,7 +2500,7 @@ ml_replace(lnum, line, copy)
if (usingNetbeans)
{
netbeans_removed(curbuf, lnum, 0, (long)STRLEN(ml_get(lnum)));
netbeans_inserted(curbuf, lnum, 0, 0, line, STRLEN(line));
netbeans_inserted(curbuf, lnum, 0, line, STRLEN(line));
}
#endif
if (curbuf->b_ml.ml_line_lnum != lnum) /* other line buffered */
@ -2605,7 +2605,7 @@ ml_delete_int(buf, lnum, message)
#ifdef FEAT_NETBEANS_INTG
if (usingNetbeans)
netbeans_removed(buf, lnum, 0, line_size);
netbeans_removed(buf, lnum, 0, (long)line_size);
#endif
/*