]>
Commit | Line | Data |
---|---|---|
03d4279c AM |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.4 | |
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.495 (after 7.3.492) | |
11 | Problem: Compiler warnings. | |
12 | Solution: Add function declaration. Remove "offset" argument. | |
13 | Files: src/misc1.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.494/src/misc1.c 2012-04-06 13:56:00.000000000 +0200 | |
17 | --- src/misc1.c 2012-04-09 20:25:58.000000000 +0200 | |
18 | *************** | |
19 | *** 4972,4977 **** | |
20 | --- 4972,4978 ---- | |
21 | static int cin_iselse __ARGS((char_u *)); | |
22 | static int cin_isdo __ARGS((char_u *)); | |
23 | static int cin_iswhileofdo __ARGS((char_u *, linenr_T, int)); | |
24 | + static int cin_is_if_for_while_before_offset __ARGS((char_u *line, int *poffset)); | |
25 | static int cin_iswhileofdo_end __ARGS((int terminated, int ind_maxparen, int ind_maxcomment)); | |
26 | static int cin_isbreak __ARGS((char_u *)); | |
27 | static int cin_is_cpp_baseclass __ARGS((colnr_T *col)); | |
28 | *************** | |
29 | *** 5771,5787 **** | |
30 | } | |
31 | ||
32 | /* | |
33 | ! * Check whether in "p" there is an "if", "for" or "while" before offset. | |
34 | * Return 0 if there is none. | |
35 | * Otherwise return !0 and update "*poffset" to point to the place where the | |
36 | * string was found. | |
37 | */ | |
38 | static int | |
39 | ! cin_is_if_for_while_before_offset(line, offset, poffset) | |
40 | char_u *line; | |
41 | - size_t offset; | |
42 | int *poffset; | |
43 | { | |
44 | ||
45 | if (offset-- < 2) | |
46 | return 0; | |
47 | --- 5772,5788 ---- | |
48 | } | |
49 | ||
50 | /* | |
51 | ! * Check whether in "p" there is an "if", "for" or "while" before "*poffset". | |
52 | * Return 0 if there is none. | |
53 | * Otherwise return !0 and update "*poffset" to point to the place where the | |
54 | * string was found. | |
55 | */ | |
56 | static int | |
57 | ! cin_is_if_for_while_before_offset(line, poffset) | |
58 | char_u *line; | |
59 | int *poffset; | |
60 | { | |
61 | + int offset = *poffset; | |
62 | ||
63 | if (offset-- < 2) | |
64 | return 0; | |
65 | *************** | |
66 | *** 5805,5812 **** | |
67 | goto probablyFound; | |
68 | } | |
69 | } | |
70 | - | |
71 | return 0; | |
72 | probablyFound: | |
73 | if (!offset || !vim_isIDc(line[offset - 1])) | |
74 | { | |
75 | --- 5806,5813 ---- | |
76 | goto probablyFound; | |
77 | } | |
78 | } | |
79 | return 0; | |
80 | + | |
81 | probablyFound: | |
82 | if (!offset || !vim_isIDc(line[offset - 1])) | |
83 | { | |
84 | *************** | |
85 | *** 6890,6897 **** | |
86 | line = ml_get(outermost.lnum); | |
87 | ||
88 | is_if_for_while = | |
89 | ! cin_is_if_for_while_before_offset(line, outermost.col, | |
90 | ! &outermost.col); | |
91 | } | |
92 | ||
93 | amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment); | |
94 | --- 6891,6897 ---- | |
95 | line = ml_get(outermost.lnum); | |
96 | ||
97 | is_if_for_while = | |
98 | ! cin_is_if_for_while_before_offset(line, &outermost.col); | |
99 | } | |
100 | ||
101 | amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment); | |
102 | *** ../vim-7.3.494/src/version.c 2012-04-06 14:30:55.000000000 +0200 | |
103 | --- src/version.c 2012-04-09 20:41:44.000000000 +0200 | |
104 | *************** | |
105 | *** 716,717 **** | |
106 | --- 716,719 ---- | |
107 | { /* Add new patch number below this line */ | |
108 | + /**/ | |
109 | + 495, | |
110 | /**/ | |
111 | ||
112 | -- | |
113 | [clop clop] | |
114 | GUARD #1: Halt! Who goes there? | |
115 | ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of | |
116 | Camelot. King of the Britons, defeator of the Saxons, sovereign of | |
117 | all England! | |
118 | GUARD #1: Pull the other one! | |
119 | The Quest for the Holy Grail (Monty Python) | |
120 | ||
121 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
122 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
123 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
124 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |