]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.019 v7.3.019
authorBram Moolenaar <Bram@vim.org>
Thu, 30 Sep 2010 19:03:26 +0000 (21:03 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 30 Sep 2010 19:03:26 +0000 (21:03 +0200)
Problem:    ":nbstart" can fail silently.
Solution:   Give an error when netbeans is not supported by the GUI. (Xavier
            de Gaye)

src/netbeans.c
src/version.c

index f39111dc9b77eef55c12bd606bbd6c194f8986d7..6f92b3c390a8a0d988ba20fbb4df0b644cfa7b41 100644 (file)
@@ -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);
 }
 
index 2154b3c1325570784c5ec69107c0dafc8f6ef982..38a081352ce4eb49713da56fe1fd1c82b74c4d26 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    19,
 /**/
     18,
 /**/