updated for version 7.2-047
diff --git a/src/main.c b/src/main.c
index 17cab6d..a091165 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1510,7 +1510,8 @@
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 @@
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 b106c95..8912575 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 47,
+/**/
46,
/**/
45,
diff --git a/src/vim.h b/src/vim.h
index 14405dc..0a979e4 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1986,6 +1986,9 @@
# endif
#endif
+#ifndef FEAT_NETBEANS_INTG
+# undef NBDEBUG
+#endif
#ifdef NBDEBUG /* Netbeans debugging. */
# include "nbdebug.h"
#else