diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-11-20 13:12:36 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-11-20 13:12:36 +0000 |
| commit | 0300597f4c743f4fe352192ef653b899e3ab544c (patch) | |
| tree | c0fc597b5b9d34fc479a1545d119d59fe1e40ca1 | |
| parent | 3025b39e973fa6edd495a61a7b6ad68c874bcc84 (diff) | |
| download | vim-git-0300597f4c743f4fe352192ef653b899e3ab544c.tar.gz | |
updated for version 7.2-047v7.2.047
| -rw-r--r-- | src/main.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 17cab6d34..a09116596 100644 --- a/src/main.c +++ b/src/main.c @@ -1510,7 +1510,8 @@ parse_command_name(parmp) early_arg_scan(parmp) mparm_T *parmp; { -#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) +#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \ + || !defined(FEAT_NETBEANS_INTG) int argc = parmp->argc; char **argv = parmp->argv; int i; @@ -1582,6 +1583,14 @@ early_arg_scan(parmp) else if (STRICMP(argv[i], "--echo-wid") == 0) echo_wid_arg = TRUE; # endif +# ifndef FEAT_NETBEANS_INTG + else if (strncmp(argv[i], "-nb", (size_t)3) == 0) + { + mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n")); + mch_exit(2); + } +# endif + } #endif } diff --git a/src/version.c b/src/version.c index b106c951b..8912575f4 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 47, +/**/ 46, /**/ 45, @@ -1986,6 +1986,9 @@ typedef int VimClipboard; /* This is required for the prototypes. */ # endif #endif +#ifndef FEAT_NETBEANS_INTG +# undef NBDEBUG +#endif #ifdef NBDEBUG /* Netbeans debugging. */ # include "nbdebug.h" #else |