]>
Commit | Line | Data |
---|---|---|
8bb52fd3 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.556 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.556 | |
11 | Problem: Compiler warnings on 64 bit Windows. | |
12 | Solution: Add type casts. (Mike Williams) | |
13 | Files: src/misc1.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.555/src/misc1.c 2012-06-13 17:28:51.000000000 +0200 | |
17 | --- src/misc1.c 2012-06-14 20:55:47.000000000 +0200 | |
18 | *************** | |
19 | *** 445,452 **** | |
20 | if (vim_regexec(®match, ml_get(lnum) + lead_len, (colnr_T)0)) | |
21 | { | |
22 | pos.lnum = lnum; | |
23 | ! pos.col = *regmatch.endp - (ml_get(lnum) + lead_len); | |
24 | ! pos.col += lead_len; | |
25 | #ifdef FEAT_VIRTUALEDIT | |
26 | pos.coladd = 0; | |
27 | #endif | |
28 | --- 445,451 ---- | |
29 | if (vim_regexec(®match, ml_get(lnum) + lead_len, (colnr_T)0)) | |
30 | { | |
31 | pos.lnum = lnum; | |
32 | ! pos.col = (colnr_T)(*regmatch.endp - ml_get(lnum)); | |
33 | #ifdef FEAT_VIRTUALEDIT | |
34 | pos.coladd = 0; | |
35 | #endif | |
36 | *************** | |
37 | *** 1354,1360 **** | |
38 | if (flags & OPENLINE_COM_LIST && second_line_indent > 0) | |
39 | { | |
40 | int i; | |
41 | ! int padding = second_line_indent - (newindent + STRLEN(leader)); | |
42 | ||
43 | /* Here whitespace is inserted after the comment char. | |
44 | * Below, set_indent(newindent, SIN_INSERT) will insert the | |
45 | --- 1353,1360 ---- | |
46 | if (flags & OPENLINE_COM_LIST && second_line_indent > 0) | |
47 | { | |
48 | int i; | |
49 | ! int padding = second_line_indent | |
50 | ! - (newindent + (int)STRLEN(leader)); | |
51 | ||
52 | /* Here whitespace is inserted after the comment char. | |
53 | * Below, set_indent(newindent, SIN_INSERT) will insert the | |
54 | *** ../vim-7.3.555/src/version.c 2012-06-13 19:19:36.000000000 +0200 | |
55 | --- src/version.c 2012-06-14 20:54:59.000000000 +0200 | |
56 | *************** | |
57 | *** 716,717 **** | |
58 | --- 716,719 ---- | |
59 | { /* Add new patch number below this line */ | |
60 | + /**/ | |
61 | + 556, | |
62 | /**/ | |
63 | ||
64 | -- | |
65 | He who laughs last, thinks slowest. | |
66 | ||
67 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
68 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
69 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
70 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |