]>
Commit | Line | Data |
---|---|---|
43e41de9 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.076 | |
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.076 | |
11 | Problem: Clang warnings for dead code. | |
12 | Solution: Remove it. (Carlo Teubner) | |
13 | Files: src/gui_gtk.c, src/if_ruby.c, src/misc2.c, src/netbeans.c, | |
14 | src/spell.c | |
15 | ||
16 | ||
17 | *** ../vim-7.3.075/src/gui_gtk.c 2010-11-24 18:48:08.000000000 +0100 | |
18 | --- src/gui_gtk.c 2010-12-08 12:25:17.000000000 +0100 | |
19 | *************** | |
20 | *** 1798,1804 **** | |
21 | char_u *repl_text; | |
22 | gboolean direction_down; | |
23 | SharedFindReplace *sfr; | |
24 | - int rc; | |
25 | ||
26 | flags = (int)(long)data; /* avoid a lint warning here */ | |
27 | ||
28 | --- 1798,1803 ---- | |
29 | *************** | |
30 | *** 1824,1830 **** | |
31 | ||
32 | repl_text = CONVERT_FROM_UTF8(repl_text); | |
33 | find_text = CONVERT_FROM_UTF8(find_text); | |
34 | ! rc = gui_do_findrepl(flags, find_text, repl_text, direction_down); | |
35 | CONVERT_FROM_UTF8_FREE(repl_text); | |
36 | CONVERT_FROM_UTF8_FREE(find_text); | |
37 | } | |
38 | --- 1823,1829 ---- | |
39 | ||
40 | repl_text = CONVERT_FROM_UTF8(repl_text); | |
41 | find_text = CONVERT_FROM_UTF8(find_text); | |
42 | ! gui_do_findrepl(flags, find_text, repl_text, direction_down); | |
43 | CONVERT_FROM_UTF8_FREE(repl_text); | |
44 | CONVERT_FROM_UTF8_FREE(find_text); | |
45 | } | |
46 | *** ../vim-7.3.075/src/if_ruby.c 2010-11-24 17:03:34.000000000 +0100 | |
47 | --- src/if_ruby.c 2010-12-08 12:30:38.000000000 +0100 | |
48 | *************** | |
49 | *** 586,594 **** | |
50 | if (u_save(eap->line1 - 1, eap->line2 + 1) != OK) | |
51 | return; | |
52 | for (i = eap->line1; i <= eap->line2; i++) { | |
53 | ! VALUE line, oldline; | |
54 | ||
55 | ! line = oldline = vim_str2rb_enc_str((char *)ml_get(i)); | |
56 | rb_lastline_set(line); | |
57 | eval_enc_string_protect((char *) eap->arg, &state); | |
58 | if (state) { | |
59 | --- 586,594 ---- | |
60 | if (u_save(eap->line1 - 1, eap->line2 + 1) != OK) | |
61 | return; | |
62 | for (i = eap->line1; i <= eap->line2; i++) { | |
63 | ! VALUE line; | |
64 | ||
65 | ! line = vim_str2rb_enc_str((char *)ml_get(i)); | |
66 | rb_lastline_set(line); | |
67 | eval_enc_string_protect((char *) eap->arg, &state); | |
68 | if (state) { | |
69 | *** ../vim-7.3.075/src/misc2.c 2010-08-15 21:57:32.000000000 +0200 | |
70 | --- src/misc2.c 2010-12-08 12:42:44.000000000 +0100 | |
71 | *************** | |
72 | *** 200,206 **** | |
73 | } | |
74 | #endif | |
75 | ||
76 | - idx = -1; | |
77 | ptr = line; | |
78 | while (col <= wcol && *ptr != NUL) | |
79 | { | |
80 | --- 200,205 ---- | |
81 | *************** | |
82 | *** 1223,1229 **** | |
83 | #endif | |
84 | ||
85 | /* | |
86 | ! * copy a string into newly allocated memory | |
87 | */ | |
88 | char_u * | |
89 | vim_strsave(string) | |
90 | --- 1222,1228 ---- | |
91 | #endif | |
92 | ||
93 | /* | |
94 | ! * Copy "string" into newly allocated memory. | |
95 | */ | |
96 | char_u * | |
97 | vim_strsave(string) | |
98 | *************** | |
99 | *** 1239,1244 **** | |
100 | --- 1238,1249 ---- | |
101 | return p; | |
102 | } | |
103 | ||
104 | + /* | |
105 | + * Copy up to "len" bytes of "string" into newly allocated memory and | |
106 | + * terminate with a NUL. | |
107 | + * The allocated memory always has size "len + 1", also when "string" is | |
108 | + * shorter. | |
109 | + */ | |
110 | char_u * | |
111 | vim_strnsave(string, len) | |
112 | char_u *string; | |
113 | *** ../vim-7.3.075/src/netbeans.c 2010-12-02 17:09:48.000000000 +0100 | |
114 | --- src/netbeans.c 2010-12-08 12:43:57.000000000 +0100 | |
115 | *************** | |
116 | *** 960,966 **** | |
117 | keyQ_T *key_node = keyHead.next; | |
118 | queue_T *cmd_node = head.next; | |
119 | nbbuf_T buf; | |
120 | - buf_T *bufp; | |
121 | int i; | |
122 | ||
123 | /* free the netbeans buffer list */ | |
124 | --- 960,965 ---- | |
125 | *************** | |
126 | *** 969,975 **** | |
127 | buf = buf_list[i]; | |
128 | vim_free(buf.displayname); | |
129 | vim_free(buf.signmap); | |
130 | ! if ((bufp=buf.bufp) != NULL) | |
131 | { | |
132 | buf.bufp->b_netbeans_file = FALSE; | |
133 | buf.bufp->b_was_netbeans_file = FALSE; | |
134 | --- 968,974 ---- | |
135 | buf = buf_list[i]; | |
136 | vim_free(buf.displayname); | |
137 | vim_free(buf.signmap); | |
138 | ! if (buf.bufp != NULL) | |
139 | { | |
140 | buf.bufp->b_netbeans_file = FALSE; | |
141 | buf.bufp->b_was_netbeans_file = FALSE; | |
142 | *** ../vim-7.3.075/src/spell.c 2010-09-29 18:32:47.000000000 +0200 | |
143 | --- src/spell.c 2010-12-08 12:47:13.000000000 +0100 | |
144 | *************** | |
145 | *** 9839,9848 **** | |
146 | { | |
147 | /* be quick for ASCII */ | |
148 | if (wp->w_s->b_spell_ismw[*p]) | |
149 | - { | |
150 | s = p + 1; /* skip a mid-word character */ | |
151 | - l = MB_BYTE2LEN(*s); | |
152 | - } | |
153 | } | |
154 | else | |
155 | { | |
156 | --- 9839,9845 ---- | |
157 | *************** | |
158 | *** 9850,9859 **** | |
159 | if (c < 256 ? wp->w_s->b_spell_ismw[c] | |
160 | : (wp->w_s->b_spell_ismw_mb != NULL | |
161 | && vim_strchr(wp->w_s->b_spell_ismw_mb, c) != NULL)) | |
162 | - { | |
163 | s = p + l; | |
164 | - l = MB_BYTE2LEN(*s); | |
165 | - } | |
166 | } | |
167 | ||
168 | c = mb_ptr2char(s); | |
169 | --- 9847,9853 ---- | |
170 | *************** | |
171 | *** 13813,13823 **** | |
172 | su->su_sfmaxscore = cleanup_suggestions(gap, | |
173 | su->su_sfmaxscore, SUG_CLEAN_COUNT(su)); | |
174 | else | |
175 | - { | |
176 | - i = su->su_maxscore; | |
177 | su->su_maxscore = cleanup_suggestions(gap, | |
178 | su->su_maxscore, SUG_CLEAN_COUNT(su)); | |
179 | - } | |
180 | } | |
181 | } | |
182 | } | |
183 | --- 13807,13814 ---- | |
184 | *** ../vim-7.3.075/src/version.c 2010-12-02 21:44:35.000000000 +0100 | |
185 | --- src/version.c 2010-12-08 13:10:00.000000000 +0100 | |
186 | *************** | |
187 | *** 716,717 **** | |
188 | --- 716,719 ---- | |
189 | { /* Add new patch number below this line */ | |
190 | + /**/ | |
191 | + 76, | |
192 | /**/ | |
193 | ||
194 | -- | |
195 | Never enter the boss's office unless it's absolutely necessary. Every boss | |
196 | saves one corner of the desk for useless assignments that are doled out like | |
197 | Halloween candy to each visitor. | |
198 | (Scott Adams - The Dilbert principle) | |
199 | ||
200 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
201 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
202 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
203 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |