|
1 To: [email protected] |
|
2 Subject: Patch 7.2.383 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.383 |
|
11 Problem: Vim doesn't build cleanly with MSVC 2010. |
|
12 Solution: Change a few types. (George Reilly) |
|
13 Files: src/ex_cmds2.c, src/if_python.c, src/syntax.c |
|
14 |
|
15 |
|
16 *** ../vim-7.2.382/src/ex_cmds2.c 2010-02-24 13:59:08.000000000 +0100 |
|
17 --- src/ex_cmds2.c 2010-03-02 17:42:54.000000000 +0100 |
|
18 *************** |
|
19 *** 1165,1171 **** |
|
20 char_u *arg; |
|
21 { |
|
22 char_u *end_subcmd; |
|
23 - int len; |
|
24 |
|
25 /* Default: expand subcommands. */ |
|
26 xp->xp_context = EXPAND_PROFILE; |
|
27 --- 1165,1170 ---- |
|
28 *************** |
|
29 *** 1176,1183 **** |
|
30 if (*end_subcmd == NUL) |
|
31 return; |
|
32 |
|
33 ! len = end_subcmd - arg; |
|
34 ! if (len == 5 && STRNCMP(arg, "start", 5) == 0) |
|
35 { |
|
36 xp->xp_context = EXPAND_FILES; |
|
37 xp->xp_pattern = skipwhite(end_subcmd); |
|
38 --- 1175,1181 ---- |
|
39 if (*end_subcmd == NUL) |
|
40 return; |
|
41 |
|
42 ! if (end_subcmd - arg == 5 && STRNCMP(arg, "start", 5) == 0) |
|
43 { |
|
44 xp->xp_context = EXPAND_FILES; |
|
45 xp->xp_pattern = skipwhite(end_subcmd); |
|
46 *** ../vim-7.2.382/src/if_python.c 2009-11-11 15:06:59.000000000 +0100 |
|
47 --- src/if_python.c 2010-03-02 17:43:39.000000000 +0100 |
|
48 *************** |
|
49 *** 2080,2086 **** |
|
50 return -1; |
|
51 |
|
52 /* When column is out of range silently correct it. */ |
|
53 ! len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE)); |
|
54 if (col > len) |
|
55 col = len; |
|
56 |
|
57 --- 2080,2086 ---- |
|
58 return -1; |
|
59 |
|
60 /* When column is out of range silently correct it. */ |
|
61 ! len = (long)STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE)); |
|
62 if (col > len) |
|
63 col = len; |
|
64 |
|
65 *** ../vim-7.2.382/src/syntax.c 2010-02-24 17:22:14.000000000 +0100 |
|
66 --- src/syntax.c 2010-03-02 17:45:25.000000000 +0100 |
|
67 *************** |
|
68 *** 3090,3096 **** |
|
69 { |
|
70 /* a "\n" at the end of the pattern may take us below the last line */ |
|
71 result->lnum = syn_buf->b_ml.ml_line_count; |
|
72 ! col = STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE)); |
|
73 } |
|
74 if (off != 0) |
|
75 { |
|
76 --- 3090,3096 ---- |
|
77 { |
|
78 /* a "\n" at the end of the pattern may take us below the last line */ |
|
79 result->lnum = syn_buf->b_ml.ml_line_count; |
|
80 ! col = (int)STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE)); |
|
81 } |
|
82 if (off != 0) |
|
83 { |
|
84 *** ../vim-7.2.382/src/version.c 2010-03-02 17:23:10.000000000 +0100 |
|
85 --- src/version.c 2010-03-02 17:48:50.000000000 +0100 |
|
86 *************** |
|
87 *** 683,684 **** |
|
88 --- 683,686 ---- |
|
89 { /* Add new patch number below this line */ |
|
90 + /**/ |
|
91 + 383, |
|
92 /**/ |
|
93 |
|
94 -- |
|
95 You were lucky to have a LAKE! There were a hundred and sixty of |
|
96 us living in a small shoebox in the middle of the road. |
|
97 |
|
98 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
99 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
100 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
101 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |