updated for version 7.2-047

diff --git a/src/main.c b/src/main.c
index 17cab6d34803e0020a6d6ac93f7b2fd3373b41ca..a091165968c274d2bc653ff0b5c2cfc145ef3dde 100644 (file)
--- 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 b106c951b98b64cf35b7ec9ea089ca891dcee818..8912575f48ba4a636fd751541c965aa175646edf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    47,
 /**/
     46,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 14405dc557a1aaac82fffabab22f75a430c76637..0a979e4e426100c1b944317f730b981ecdabeba7 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -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