diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-09-30 21:03:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-09-30 21:03:26 +0200 |
| commit | 010955d85636194b44c2459083d264366a5cd21d (patch) | |
| tree | 176263099ecdb0a4a2b792554ae6d8dfd29acc27 | |
| parent | 725fd86f9d774560609fca231201d9f9ff4a016f (diff) | |
| download | vim-010955d85636194b44c2459083d264366a5cd21d.tar.gz | |
Problem: ":nbstart" can fail silently.
Solution: Give an error when netbeans is not supported by the GUI. (Xavier
de Gaye)
| -rw-r--r-- | src/netbeans.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/netbeans.c b/src/netbeans.c index f39111dc..6f92b3c3 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 2154b3c1..38a08135 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, |