summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/netbeans.c10
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/netbeans.c b/src/netbeans.c
index f39111dc9..6f92b3c39 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -2773,6 +2773,16 @@ ex_nbkey(eap)
ex_nbstart(eap)
exarg_T *eap;
{
+#ifdef FEAT_GUI
+# if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) \
+ && !defined(FEAT_GUI_W32)
+ if (gui.in_use)
+ {
+ EMSG(_("E838: netbeans is not supported with this GUI"));
+ return;
+ }
+# endif
+#endif
netbeans_open((char *)eap->arg, FALSE);
}
diff --git a/src/version.c b/src/version.c
index 2154b3c13..38a081352 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 19,
+/**/
18,
/**/
17,