|
 |
7f6284e |
To: vim-dev@vim.org
|
|
|
7f6284e |
Subject: Patch 7.2.047
|
|
|
7f6284e |
Fcc: outbox
|
|
|
7f6284e |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
7f6284e |
Mime-Version: 1.0
|
|
|
7f6284e |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
7f6284e |
Content-Transfer-Encoding: 8bit
|
|
|
7f6284e |
------------
|
|
|
7f6284e |
|
|
|
7f6284e |
Patch 7.2.047
|
|
|
7f6284e |
Problem: Starting Vim with the -nb argument while it's not supported causes
|
|
|
7f6284e |
the other side to hang.
|
|
|
7f6284e |
Solution: When -nb is used while it's not supported exit Vim. (Xavier de
|
|
|
7f6284e |
Gaye)
|
|
|
7f6284e |
Files: src/main.c, src/vim.h
|
|
|
7f6284e |
|
|
|
7f6284e |
|
|
|
7f6284e |
*** ../vim-7.2.046/src/main.c Sat Nov 15 14:10:23 2008
|
|
|
7f6284e |
--- src/main.c Thu Nov 20 14:09:27 2008
|
|
|
7f6284e |
***************
|
|
|
7f6284e |
*** 1510,1516 ****
|
|
|
7f6284e |
early_arg_scan(parmp)
|
|
|
7f6284e |
mparm_T *parmp;
|
|
|
7f6284e |
{
|
|
|
7f6284e |
! #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
|
|
|
7f6284e |
int argc = parmp->argc;
|
|
|
7f6284e |
char **argv = parmp->argv;
|
|
|
7f6284e |
int i;
|
|
|
7f6284e |
--- 1510,1517 ----
|
|
|
7f6284e |
early_arg_scan(parmp)
|
|
|
7f6284e |
mparm_T *parmp;
|
|
|
7f6284e |
{
|
|
|
7f6284e |
! #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
|
|
|
7f6284e |
! || !defined(FEAT_NETBEANS_INTG)
|
|
|
7f6284e |
int argc = parmp->argc;
|
|
|
7f6284e |
char **argv = parmp->argv;
|
|
|
7f6284e |
int i;
|
|
|
7f6284e |
***************
|
|
|
7f6284e |
*** 1582,1587 ****
|
|
|
7f6284e |
--- 1583,1596 ----
|
|
|
7f6284e |
else if (STRICMP(argv[i], "--echo-wid") == 0)
|
|
|
7f6284e |
echo_wid_arg = TRUE;
|
|
|
7f6284e |
# endif
|
|
|
7f6284e |
+ # ifndef FEAT_NETBEANS_INTG
|
|
|
7f6284e |
+ else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
|
|
|
7f6284e |
+ {
|
|
|
7f6284e |
+ mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
|
|
|
7f6284e |
+ mch_exit(2);
|
|
|
7f6284e |
+ }
|
|
|
7f6284e |
+ # endif
|
|
|
7f6284e |
+
|
|
|
7f6284e |
}
|
|
|
7f6284e |
#endif
|
|
|
7f6284e |
}
|
|
|
7f6284e |
*** ../vim-7.2.046/src/vim.h Thu Nov 20 10:26:19 2008
|
|
|
7f6284e |
--- src/vim.h Thu Nov 20 12:06:14 2008
|
|
|
7f6284e |
***************
|
|
|
7f6284e |
*** 1986,1991 ****
|
|
|
7f6284e |
--- 1986,1994 ----
|
|
|
7f6284e |
# endif
|
|
|
7f6284e |
#endif
|
|
|
7f6284e |
|
|
|
7f6284e |
+ #ifndef FEAT_NETBEANS_INTG
|
|
|
7f6284e |
+ # undef NBDEBUG
|
|
|
7f6284e |
+ #endif
|
|
|
7f6284e |
#ifdef NBDEBUG /* Netbeans debugging. */
|
|
|
7f6284e |
# include "nbdebug.h"
|
|
|
7f6284e |
#else
|
|
|
7f6284e |
*** ../vim-7.2.046/src/version.c Thu Nov 20 11:55:53 2008
|
|
|
7f6284e |
--- src/version.c Thu Nov 20 14:07:57 2008
|
|
|
7f6284e |
***************
|
|
|
7f6284e |
*** 678,679 ****
|
|
|
7f6284e |
--- 678,681 ----
|
|
|
7f6284e |
{ /* Add new patch number below this line */
|
|
|
7f6284e |
+ /**/
|
|
|
7f6284e |
+ 47,
|
|
|
7f6284e |
/**/
|
|
|
7f6284e |
|
|
|
7f6284e |
--
|
|
|
7f6284e |
FIRST HEAD: Oh! quick! get the sword out I want to cut his head off.
|
|
|
7f6284e |
THIRD HEAD: Oh, cut your own head off.
|
|
|
7f6284e |
SECOND HEAD: Yes - do us all a favour.
|
|
|
7f6284e |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
7f6284e |
|
|
|
7f6284e |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
7f6284e |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
7f6284e |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
7f6284e |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|