aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2-047

Browse Source
This commit is contained in:
Bram Moolenaar 2008-11-20 13:12:36 +00:00
parent 3025b39e97
commit 0300597f4c
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -1510,7 +1510,8 @@ parse_command_name(parmp)
early_arg_scan(parmp) early_arg_scan(parmp)
mparm_T *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; int argc = parmp->argc;
char **argv = parmp->argv; char **argv = parmp->argv;
int i; int i;
@ -1582,6 +1583,14 @@ early_arg_scan(parmp)
else if (STRICMP(argv[i], "--echo-wid") == 0) else if (STRICMP(argv[i], "--echo-wid") == 0)
echo_wid_arg = TRUE; echo_wid_arg = TRUE;
# endif # 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 #endif
} }

2
src/version.c
View File

@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
47,
/**/ /**/
46, 46,
/**/ /**/

3
src/vim.h
View File

@ -1986,6 +1986,9 @@ typedef int VimClipboard; /* This is required for the prototypes. */
# endif # endif
#endif #endif
#ifndef FEAT_NETBEANS_INTG
# undef NBDEBUG
#endif
#ifdef NBDEBUG /* Netbeans debugging. */ #ifdef NBDEBUG /* Netbeans debugging. */
# include "nbdebug.h" # include "nbdebug.h"
#else #else