]>
Commit | Line | Data |
---|---|---|
65bfde4c AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.047 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.047 | |
11 | Problem: Starting Vim with the -nb argument while it's not supported causes | |
12 | the other side to hang. | |
13 | Solution: When -nb is used while it's not supported exit Vim. (Xavier de | |
14 | Gaye) | |
15 | Files: src/main.c, src/vim.h | |
16 | ||
17 | ||
18 | *** ../vim-7.2.046/src/main.c Sat Nov 15 14:10:23 2008 | |
19 | --- src/main.c Thu Nov 20 14:09:27 2008 | |
20 | *************** | |
21 | *** 1510,1516 **** | |
22 | early_arg_scan(parmp) | |
23 | mparm_T *parmp; | |
24 | { | |
25 | ! #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) | |
26 | int argc = parmp->argc; | |
27 | char **argv = parmp->argv; | |
28 | int i; | |
29 | --- 1510,1517 ---- | |
30 | early_arg_scan(parmp) | |
31 | mparm_T *parmp; | |
32 | { | |
33 | ! #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \ | |
34 | ! || !defined(FEAT_NETBEANS_INTG) | |
35 | int argc = parmp->argc; | |
36 | char **argv = parmp->argv; | |
37 | int i; | |
38 | *************** | |
39 | *** 1582,1587 **** | |
40 | --- 1583,1596 ---- | |
41 | else if (STRICMP(argv[i], "--echo-wid") == 0) | |
42 | echo_wid_arg = TRUE; | |
43 | # endif | |
44 | + # ifndef FEAT_NETBEANS_INTG | |
45 | + else if (strncmp(argv[i], "-nb", (size_t)3) == 0) | |
46 | + { | |
47 | + mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n")); | |
48 | + mch_exit(2); | |
49 | + } | |
50 | + # endif | |
51 | + | |
52 | } | |
53 | #endif | |
54 | } | |
55 | *** ../vim-7.2.046/src/vim.h Thu Nov 20 10:26:19 2008 | |
56 | --- src/vim.h Thu Nov 20 12:06:14 2008 | |
57 | *************** | |
58 | *** 1986,1991 **** | |
59 | --- 1986,1994 ---- | |
60 | # endif | |
61 | #endif | |
62 | ||
63 | + #ifndef FEAT_NETBEANS_INTG | |
64 | + # undef NBDEBUG | |
65 | + #endif | |
66 | #ifdef NBDEBUG /* Netbeans debugging. */ | |
67 | # include "nbdebug.h" | |
68 | #else | |
69 | *** ../vim-7.2.046/src/version.c Thu Nov 20 11:55:53 2008 | |
70 | --- src/version.c Thu Nov 20 14:07:57 2008 | |
71 | *************** | |
72 | *** 678,679 **** | |
73 | --- 678,681 ---- | |
74 | { /* Add new patch number below this line */ | |
75 | + /**/ | |
76 | + 47, | |
77 | /**/ | |
78 | ||
79 | -- | |
80 | FIRST HEAD: Oh! quick! get the sword out I want to cut his head off. | |
81 | THIRD HEAD: Oh, cut your own head off. | |
82 | SECOND HEAD: Yes - do us all a favour. | |
83 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
84 | ||
85 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
86 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
87 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
88 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |