summaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-05-22 21:34:09 +0200
committerBram Moolenaar <Bram@vim.org>2010-05-22 21:34:09 +0200
commitb26e6327e69ed57c897d59183a4171c5eb979c19 (patch)
tree523c56a73826b7917ebe46580ce7936f86556aae /src/main.c
parent67c53844343011089e1b847200b5c5257a83e1c4 (diff)
Add :nbstart and :nbclose.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 14921ff30f..cba40ea0f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -932,7 +932,7 @@ main
stuffcharReadbuff(K_NOP);
#ifdef FEAT_NETBEANS_INTG
- if (usingNetbeans)
+ if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
{
# ifdef FEAT_GUI
# if !defined(FEAT_GUI_MOTIF) && !defined(FEAT_GUI_GTK) \
@@ -945,7 +945,7 @@ main
# endif
# endif
/* Tell the client that it can start sending commands. */
- netbeans_startup_done();
+ netbeans_open(netbeansArg + 3, TRUE);
}
#endif
@@ -1891,7 +1891,6 @@ command_line_scan(parmp)
/* checking for "-nb", netbeans parameters */
if (argv[0][argv_idx] == 'b')
{
- ++usingNetbeans;
netbeansArg = argv[0];
argv_idx = -1; /* skip to next argument */
}
@@ -2385,7 +2384,7 @@ check_tty(parmp)
* input buffer so fast I can't even kill the process in under 2
* minutes (and it beeps continuously the whole time :-)
*/
- if (usingNetbeans && (!parmp->stdout_isatty || !input_isatty))
+ if (netbeans_active() && (!parmp->stdout_isatty || !input_isatty))
{
mch_errmsg(_("Vim: Error: Failure to start gvim from NetBeans\n"));
exit(1);