1 To: [email protected] |
|
2 Subject: Patch 7.2.174 |
|
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.174 |
|
11 Problem: Too many warnings from gcc -Wextra. |
|
12 Solution: Change initializer. Add UNUSED. Add type casts. |
|
13 Files: src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c, |
|
14 src/ex_getln.c, src/fileio.c, getchar.c, globals.h, main.c, |
|
15 memline.c, message.c, src/misc1.c, src/move.c, src/normal.c, |
|
16 src/option.c, src/os_unix.c, src/os_unix.h, src/regexp.c, |
|
17 src/search.c, src/tag.c |
|
18 |
|
19 |
|
20 *** ../vim-7.2.173/src/edit.c 2009-05-14 22:19:19.000000000 +0200 |
|
21 --- src/edit.c 2009-05-15 21:06:07.000000000 +0200 |
|
22 *************** |
|
23 *** 8991,8997 **** |
|
24 foldOpenCursor(); |
|
25 #endif |
|
26 undisplay_dollar(); |
|
27 ! if (gchar_cursor() != NUL || virtual_active() |
|
28 ) |
|
29 { |
|
30 start_arrow(&curwin->w_cursor); |
|
31 --- 8992,9001 ---- |
|
32 foldOpenCursor(); |
|
33 #endif |
|
34 undisplay_dollar(); |
|
35 ! if (gchar_cursor() != NUL |
|
36 ! #ifdef FEAT_VIRTUALEDIT |
|
37 ! || virtual_active() |
|
38 ! #endif |
|
39 ) |
|
40 { |
|
41 start_arrow(&curwin->w_cursor); |
|
42 *** ../vim-7.2.173/src/eval.c 2009-04-22 16:07:57.000000000 +0200 |
|
43 --- src/eval.c 2009-05-15 21:18:08.000000000 +0200 |
|
44 *************** |
|
45 *** 8303,8312 **** |
|
46 /* |
|
47 * "argc()" function |
|
48 */ |
|
49 - /* ARGSUSED */ |
|
50 static void |
|
51 f_argc(argvars, rettv) |
|
52 ! typval_T *argvars; |
|
53 typval_T *rettv; |
|
54 { |
|
55 rettv->vval.v_number = ARGCOUNT; |
|
56 --- 8303,8311 ---- |
|
57 /* |
|
58 * "argc()" function |
|
59 */ |
|
60 static void |
|
61 f_argc(argvars, rettv) |
|
62 ! typval_T *argvars UNUSED; |
|
63 typval_T *rettv; |
|
64 { |
|
65 rettv->vval.v_number = ARGCOUNT; |
|
66 *************** |
|
67 *** 8315,8324 **** |
|
68 /* |
|
69 * "argidx()" function |
|
70 */ |
|
71 - /* ARGSUSED */ |
|
72 static void |
|
73 f_argidx(argvars, rettv) |
|
74 ! typval_T *argvars; |
|
75 typval_T *rettv; |
|
76 { |
|
77 rettv->vval.v_number = curwin->w_arg_idx; |
|
78 --- 8314,8322 ---- |
|
79 /* |
|
80 * "argidx()" function |
|
81 */ |
|
82 static void |
|
83 f_argidx(argvars, rettv) |
|
84 ! typval_T *argvars UNUSED; |
|
85 typval_T *rettv; |
|
86 { |
|
87 rettv->vval.v_number = curwin->w_arg_idx; |
|
88 *************** |
|
89 *** 8396,8405 **** |
|
90 /* |
|
91 * "browse(save, title, initdir, default)" function |
|
92 */ |
|
93 - /* ARGSUSED */ |
|
94 static void |
|
95 f_browse(argvars, rettv) |
|
96 ! typval_T *argvars; |
|
97 typval_T *rettv; |
|
98 { |
|
99 #ifdef FEAT_BROWSE |
|
100 --- 8394,8402 ---- |
|
101 /* |
|
102 * "browse(save, title, initdir, default)" function |
|
103 */ |
|
104 static void |
|
105 f_browse(argvars, rettv) |
|
106 ! typval_T *argvars UNUSED; |
|
107 typval_T *rettv; |
|
108 { |
|
109 #ifdef FEAT_BROWSE |
|
110 *************** |
|
111 *** 8431,8440 **** |
|
112 /* |
|
113 * "browsedir(title, initdir)" function |
|
114 */ |
|
115 - /* ARGSUSED */ |
|
116 static void |
|
117 f_browsedir(argvars, rettv) |
|
118 ! typval_T *argvars; |
|
119 typval_T *rettv; |
|
120 { |
|
121 #ifdef FEAT_BROWSE |
|
122 --- 8428,8436 ---- |
|
123 /* |
|
124 * "browsedir(title, initdir)" function |
|
125 */ |
|
126 static void |
|
127 f_browsedir(argvars, rettv) |
|
128 ! typval_T *argvars UNUSED; |
|
129 typval_T *rettv; |
|
130 { |
|
131 #ifdef FEAT_BROWSE |
|
132 *************** |
|
133 *** 8801,8810 **** |
|
134 /* |
|
135 * "changenr()" function |
|
136 */ |
|
137 - /*ARGSUSED*/ |
|
138 static void |
|
139 f_changenr(argvars, rettv) |
|
140 ! typval_T *argvars; |
|
141 typval_T *rettv; |
|
142 { |
|
143 rettv->vval.v_number = curbuf->b_u_seq_cur; |
|
144 --- 8797,8805 ---- |
|
145 /* |
|
146 * "changenr()" function |
|
147 */ |
|
148 static void |
|
149 f_changenr(argvars, rettv) |
|
150 ! typval_T *argvars UNUSED; |
|
151 typval_T *rettv; |
|
152 { |
|
153 rettv->vval.v_number = curbuf->b_u_seq_cur; |
|
154 *************** |
|
155 *** 8854,8863 **** |
|
156 /* |
|
157 * "clearmatches()" function |
|
158 */ |
|
159 - /*ARGSUSED*/ |
|
160 static void |
|
161 f_clearmatches(argvars, rettv) |
|
162 ! typval_T *argvars; |
|
163 typval_T *rettv; |
|
164 { |
|
165 #ifdef FEAT_SEARCH_EXTRA |
|
166 --- 8849,8857 ---- |
|
167 /* |
|
168 * "clearmatches()" function |
|
169 */ |
|
170 static void |
|
171 f_clearmatches(argvars, rettv) |
|
172 ! typval_T *argvars UNUSED; |
|
173 typval_T *rettv; |
|
174 { |
|
175 #ifdef FEAT_SEARCH_EXTRA |
|
176 *** ../vim-7.2.173/src/ex_cmds.c 2009-05-14 22:19:19.000000000 +0200 |
|
177 --- src/ex_cmds.c 2009-05-15 20:42:18.000000000 +0200 |
|
178 *************** |
|
179 *** 4040,4047 **** |
|
180 --- 4040,4049 ---- |
|
181 bigness = curwin->w_height; |
|
182 else if (firstwin == lastwin) |
|
183 bigness = curwin->w_p_scr * 2; |
|
184 + #ifdef FEAT_WINDOWS |
|
185 else |
|
186 bigness = curwin->w_height - 3; |
|
187 + #endif |
|
188 if (bigness < 1) |
|
189 bigness = 1; |
|
190 |
|
191 *** ../vim-7.2.173/src/ex_docmd.c 2009-05-13 18:54:14.000000000 +0200 |
|
192 --- src/ex_docmd.c 2009-05-15 20:47:58.000000000 +0200 |
|
193 *************** |
|
194 *** 1578,1588 **** |
|
195 * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals |
|
196 * "func". * Otherwise return TRUE when "fgetline" equals "func". |
|
197 */ |
|
198 - /*ARGSUSED*/ |
|
199 int |
|
200 getline_equal(fgetline, cookie, func) |
|
201 char_u *(*fgetline) __ARGS((int, void *, int)); |
|
202 ! void *cookie; /* argument for fgetline() */ |
|
203 char_u *(*func) __ARGS((int, void *, int)); |
|
204 { |
|
205 #ifdef FEAT_EVAL |
|
206 --- 1578,1587 ---- |
|
207 * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals |
|
208 * "func". * Otherwise return TRUE when "fgetline" equals "func". |
|
209 */ |
|
210 int |
|
211 getline_equal(fgetline, cookie, func) |
|
212 char_u *(*fgetline) __ARGS((int, void *, int)); |
|
213 ! void *cookie UNUSED; /* argument for fgetline() */ |
|
214 char_u *(*func) __ARGS((int, void *, int)); |
|
215 { |
|
216 #ifdef FEAT_EVAL |
|
217 *************** |
|
218 *** 1610,1619 **** |
|
219 * If "fgetline" is get_loop_line(), return the cookie used by the original |
|
220 * getline function. Otherwise return "cookie". |
|
221 */ |
|
222 - /*ARGSUSED*/ |
|
223 void * |
|
224 getline_cookie(fgetline, cookie) |
|
225 ! char_u *(*fgetline) __ARGS((int, void *, int)); |
|
226 void *cookie; /* argument for fgetline() */ |
|
227 { |
|
228 # ifdef FEAT_EVAL |
|
229 --- 1609,1617 ---- |
|
230 * If "fgetline" is get_loop_line(), return the cookie used by the original |
|
231 * getline function. Otherwise return "cookie". |
|
232 */ |
|
233 void * |
|
234 getline_cookie(fgetline, cookie) |
|
235 ! char_u *(*fgetline) __ARGS((int, void *, int)) UNUSED; |
|
236 void *cookie; /* argument for fgetline() */ |
|
237 { |
|
238 # ifdef FEAT_EVAL |
|
239 *************** |
|
240 *** 2754,2764 **** |
|
241 * "full" is set to TRUE if the whole command name matched. |
|
242 * Returns NULL for an ambiguous user command. |
|
243 */ |
|
244 - /*ARGSUSED*/ |
|
245 static char_u * |
|
246 find_command(eap, full) |
|
247 exarg_T *eap; |
|
248 ! int *full; |
|
249 { |
|
250 int len; |
|
251 char_u *p; |
|
252 --- 2752,2761 ---- |
|
253 * "full" is set to TRUE if the whole command name matched. |
|
254 * Returns NULL for an ambiguous user command. |
|
255 */ |
|
256 static char_u * |
|
257 find_command(eap, full) |
|
258 exarg_T *eap; |
|
259 ! int *full UNUSED; |
|
260 { |
|
261 int len; |
|
262 char_u *p; |
|
263 *************** |
|
264 *** 5053,5062 **** |
|
265 /* |
|
266 * Function given to ExpandGeneric() to obtain the list of command names. |
|
267 */ |
|
268 - /*ARGSUSED*/ |
|
269 char_u * |
|
270 get_command_name(xp, idx) |
|
271 ! expand_T *xp; |
|
272 int idx; |
|
273 { |
|
274 if (idx >= (int)CMD_SIZE) |
|
275 --- 5050,5058 ---- |
|
276 /* |
|
277 * Function given to ExpandGeneric() to obtain the list of command names. |
|
278 */ |
|
279 char_u * |
|
280 get_command_name(xp, idx) |
|
281 ! expand_T *xp UNUSED; |
|
282 int idx; |
|
283 { |
|
284 if (idx >= (int)CMD_SIZE) |
|
285 *************** |
|
286 *** 5573,5582 **** |
|
287 * ":comclear" |
|
288 * Clear all user commands, global and for current buffer. |
|
289 */ |
|
290 - /*ARGSUSED*/ |
|
291 void |
|
292 ex_comclear(eap) |
|
293 ! exarg_T *eap; |
|
294 { |
|
295 uc_clear(&ucmds); |
|
296 uc_clear(&curbuf->b_ucmds); |
|
297 --- 5569,5577 ---- |
|
298 * ":comclear" |
|
299 * Clear all user commands, global and for current buffer. |
|
300 */ |
|
301 void |
|
302 ex_comclear(eap) |
|
303 ! exarg_T *eap UNUSED; |
|
304 { |
|
305 uc_clear(&ucmds); |
|
306 uc_clear(&curbuf->b_ucmds); |
|
307 *************** |
|
308 *** 6072,6081 **** |
|
309 /* |
|
310 * Function given to ExpandGeneric() to obtain the list of user command names. |
|
311 */ |
|
312 - /*ARGSUSED*/ |
|
313 char_u * |
|
314 get_user_commands(xp, idx) |
|
315 ! expand_T *xp; |
|
316 int idx; |
|
317 { |
|
318 if (idx < curbuf->b_ucmds.ga_len) |
|
319 --- 6067,6075 ---- |
|
320 /* |
|
321 * Function given to ExpandGeneric() to obtain the list of user command names. |
|
322 */ |
|
323 char_u * |
|
324 get_user_commands(xp, idx) |
|
325 ! expand_T *xp UNUSED; |
|
326 int idx; |
|
327 { |
|
328 if (idx < curbuf->b_ucmds.ga_len) |
|
329 *************** |
|
330 *** 6090,6099 **** |
|
331 * Function given to ExpandGeneric() to obtain the list of user command |
|
332 * attributes. |
|
333 */ |
|
334 - /*ARGSUSED*/ |
|
335 char_u * |
|
336 get_user_cmd_flags(xp, idx) |
|
337 ! expand_T *xp; |
|
338 int idx; |
|
339 { |
|
340 static char *user_cmd_flags[] = |
|
341 --- 6084,6092 ---- |
|
342 * Function given to ExpandGeneric() to obtain the list of user command |
|
343 * attributes. |
|
344 */ |
|
345 char_u * |
|
346 get_user_cmd_flags(xp, idx) |
|
347 ! expand_T *xp UNUSED; |
|
348 int idx; |
|
349 { |
|
350 static char *user_cmd_flags[] = |
|
351 *************** |
|
352 *** 6108,6117 **** |
|
353 /* |
|
354 * Function given to ExpandGeneric() to obtain the list of values for -nargs. |
|
355 */ |
|
356 - /*ARGSUSED*/ |
|
357 char_u * |
|
358 get_user_cmd_nargs(xp, idx) |
|
359 ! expand_T *xp; |
|
360 int idx; |
|
361 { |
|
362 static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; |
|
363 --- 6101,6109 ---- |
|
364 /* |
|
365 * Function given to ExpandGeneric() to obtain the list of values for -nargs. |
|
366 */ |
|
367 char_u * |
|
368 get_user_cmd_nargs(xp, idx) |
|
369 ! expand_T *xp UNUSED; |
|
370 int idx; |
|
371 { |
|
372 static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; |
|
373 *************** |
|
374 *** 6124,6133 **** |
|
375 /* |
|
376 * Function given to ExpandGeneric() to obtain the list of values for -complete. |
|
377 */ |
|
378 - /*ARGSUSED*/ |
|
379 char_u * |
|
380 get_user_cmd_complete(xp, idx) |
|
381 ! expand_T *xp; |
|
382 int idx; |
|
383 { |
|
384 return (char_u *)command_complete[idx].name; |
|
385 --- 6116,6124 ---- |
|
386 /* |
|
387 * Function given to ExpandGeneric() to obtain the list of values for -complete. |
|
388 */ |
|
389 char_u * |
|
390 get_user_cmd_complete(xp, idx) |
|
391 ! expand_T *xp UNUSED; |
|
392 int idx; |
|
393 { |
|
394 return (char_u *)command_complete[idx].name; |
|
395 *************** |
|
396 *** 6305,6314 **** |
|
397 /* |
|
398 * ":cquit". |
|
399 */ |
|
400 - /*ARGSUSED*/ |
|
401 static void |
|
402 ex_cquit(eap) |
|
403 ! exarg_T *eap; |
|
404 { |
|
405 getout(1); /* this does not always pass on the exit code to the Manx |
|
406 compiler. why? */ |
|
407 --- 6296,6304 ---- |
|
408 /* |
|
409 * ":cquit". |
|
410 */ |
|
411 static void |
|
412 ex_cquit(eap) |
|
413 ! exarg_T *eap UNUSED; |
|
414 { |
|
415 getout(1); /* this does not always pass on the exit code to the Manx |
|
416 compiler. why? */ |
|
417 *************** |
|
418 *** 6750,6759 **** |
|
419 /* |
|
420 * ":shell". |
|
421 */ |
|
422 - /*ARGSUSED*/ |
|
423 static void |
|
424 ex_shell(eap) |
|
425 ! exarg_T *eap; |
|
426 { |
|
427 do_shell(NULL, 0); |
|
428 } |
|
429 --- 6740,6748 ---- |
|
430 /* |
|
431 * ":shell". |
|
432 */ |
|
433 static void |
|
434 ex_shell(eap) |
|
435 ! exarg_T *eap UNUSED; |
|
436 { |
|
437 do_shell(NULL, 0); |
|
438 } |
|
439 *************** |
|
440 *** 7057,7066 **** |
|
441 /* |
|
442 * ":preserve". |
|
443 */ |
|
444 - /*ARGSUSED*/ |
|
445 static void |
|
446 ex_preserve(eap) |
|
447 ! exarg_T *eap; |
|
448 { |
|
449 curbuf->b_flags |= BF_PRESERVED; |
|
450 ml_preserve(curbuf, TRUE); |
|
451 --- 7046,7054 ---- |
|
452 /* |
|
453 * ":preserve". |
|
454 */ |
|
455 static void |
|
456 ex_preserve(eap) |
|
457 ! exarg_T *eap UNUSED; |
|
458 { |
|
459 curbuf->b_flags |= BF_PRESERVED; |
|
460 ml_preserve(curbuf, TRUE); |
|
461 *************** |
|
462 *** 7292,7301 **** |
|
463 /* |
|
464 * :tabs command: List tabs and their contents. |
|
465 */ |
|
466 - /*ARGSUSED*/ |
|
467 static void |
|
468 ex_tabs(eap) |
|
469 ! exarg_T *eap; |
|
470 { |
|
471 tabpage_T *tp; |
|
472 win_T *wp; |
|
473 --- 7280,7288 ---- |
|
474 /* |
|
475 * :tabs command: List tabs and their contents. |
|
476 */ |
|
477 static void |
|
478 ex_tabs(eap) |
|
479 ! exarg_T *eap UNUSED; |
|
480 { |
|
481 tabpage_T *tp; |
|
482 win_T *wp; |
|
483 *************** |
|
484 *** 7482,7488 **** |
|
485 /* |
|
486 * ":edit <file>" command and alikes. |
|
487 */ |
|
488 - /*ARGSUSED*/ |
|
489 void |
|
490 do_exedit(eap, old_curwin) |
|
491 exarg_T *eap; |
|
492 --- 7469,7474 ---- |
|
493 *************** |
|
494 *** 7694,7703 **** |
|
495 } |
|
496 #endif |
|
497 |
|
498 - /*ARGSUSED*/ |
|
499 static void |
|
500 ex_swapname(eap) |
|
501 ! exarg_T *eap; |
|
502 { |
|
503 if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL) |
|
504 MSG(_("No swap file")); |
|
505 --- 7680,7688 ---- |
|
506 } |
|
507 #endif |
|
508 |
|
509 static void |
|
510 ex_swapname(eap) |
|
511 ! exarg_T *eap UNUSED; |
|
512 { |
|
513 if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL) |
|
514 MSG(_("No swap file")); |
|
515 *************** |
|
516 *** 7710,7719 **** |
|
517 * offset. |
|
518 * (1998-11-02 16:21:01 R. Edward Ralston <[email protected]>) |
|
519 */ |
|
520 - /*ARGSUSED*/ |
|
521 static void |
|
522 ex_syncbind(eap) |
|
523 ! exarg_T *eap; |
|
524 { |
|
525 #ifdef FEAT_SCROLLBIND |
|
526 win_T *wp; |
|
527 --- 7695,7703 ---- |
|
528 * offset. |
|
529 * (1998-11-02 16:21:01 R. Edward Ralston <[email protected]>) |
|
530 */ |
|
531 static void |
|
532 ex_syncbind(eap) |
|
533 ! exarg_T *eap UNUSED; |
|
534 { |
|
535 #ifdef FEAT_SCROLLBIND |
|
536 win_T *wp; |
|
537 *************** |
|
538 *** 7983,7992 **** |
|
539 /* |
|
540 * ":pwd". |
|
541 */ |
|
542 - /*ARGSUSED*/ |
|
543 static void |
|
544 ex_pwd(eap) |
|
545 ! exarg_T *eap; |
|
546 { |
|
547 if (mch_dirname(NameBuff, MAXPATHL) == OK) |
|
548 { |
|
549 --- 7967,7975 ---- |
|
550 /* |
|
551 * ":pwd". |
|
552 */ |
|
553 static void |
|
554 ex_pwd(eap) |
|
555 ! exarg_T *eap UNUSED; |
|
556 { |
|
557 if (mch_dirname(NameBuff, MAXPATHL) == OK) |
|
558 { |
|
559 *************** |
|
560 *** 8417,8426 **** |
|
561 /* |
|
562 * ":undo". |
|
563 */ |
|
564 - /*ARGSUSED*/ |
|
565 static void |
|
566 ex_undo(eap) |
|
567 ! exarg_T *eap; |
|
568 { |
|
569 if (eap->addr_count == 1) /* :undo 123 */ |
|
570 undo_time(eap->line2, FALSE, TRUE); |
|
571 --- 8400,8408 ---- |
|
572 /* |
|
573 * ":undo". |
|
574 */ |
|
575 static void |
|
576 ex_undo(eap) |
|
577 ! exarg_T *eap UNUSED; |
|
578 { |
|
579 if (eap->addr_count == 1) /* :undo 123 */ |
|
580 undo_time(eap->line2, FALSE, TRUE); |
|
581 *************** |
|
582 *** 8431,8440 **** |
|
583 /* |
|
584 * ":redo". |
|
585 */ |
|
586 - /*ARGSUSED*/ |
|
587 static void |
|
588 ex_redo(eap) |
|
589 ! exarg_T *eap; |
|
590 { |
|
591 u_redo(1); |
|
592 } |
|
593 --- 8413,8421 ---- |
|
594 /* |
|
595 * ":redo". |
|
596 */ |
|
597 static void |
|
598 ex_redo(eap) |
|
599 ! exarg_T *eap UNUSED; |
|
600 { |
|
601 u_redo(1); |
|
602 } |
|
603 *************** |
|
604 *** 8442,8448 **** |
|
605 /* |
|
606 * ":earlier" and ":later". |
|
607 */ |
|
608 - /*ARGSUSED*/ |
|
609 static void |
|
610 ex_later(eap) |
|
611 exarg_T *eap; |
|
612 --- 8423,8428 ---- |
|
613 *************** |
|
614 *** 8627,8636 **** |
|
615 /* |
|
616 * ":redrawstatus": force redraw of status line(s) |
|
617 */ |
|
618 - /*ARGSUSED*/ |
|
619 static void |
|
620 ex_redrawstatus(eap) |
|
621 ! exarg_T *eap; |
|
622 { |
|
623 #if defined(FEAT_WINDOWS) |
|
624 int r = RedrawingDisabled; |
|
625 --- 8607,8615 ---- |
|
626 /* |
|
627 * ":redrawstatus": force redraw of status line(s) |
|
628 */ |
|
629 static void |
|
630 ex_redrawstatus(eap) |
|
631 ! exarg_T *eap UNUSED; |
|
632 { |
|
633 #if defined(FEAT_WINDOWS) |
|
634 int r = RedrawingDisabled; |
|
635 *************** |
|
636 *** 8891,8901 **** |
|
637 |
|
638 #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \ |
|
639 || defined(PROTO) |
|
640 - /*ARGSUSED*/ |
|
641 int |
|
642 vim_mkdir_emsg(name, prot) |
|
643 char_u *name; |
|
644 ! int prot; |
|
645 { |
|
646 if (vim_mkdir(name, prot) != 0) |
|
647 { |
|
648 --- 8870,8879 ---- |
|
649 |
|
650 #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \ |
|
651 || defined(PROTO) |
|
652 int |
|
653 vim_mkdir_emsg(name, prot) |
|
654 char_u *name; |
|
655 ! int prot UNUSED; |
|
656 { |
|
657 if (vim_mkdir(name, prot) != 0) |
|
658 { |
|
659 *************** |
|
660 *** 10968,10977 **** |
|
661 } |
|
662 #endif |
|
663 |
|
664 - /*ARGSUSED*/ |
|
665 static void |
|
666 ex_digraphs(eap) |
|
667 ! exarg_T *eap; |
|
668 { |
|
669 #ifdef FEAT_DIGRAPHS |
|
670 if (*eap->arg != NUL) |
|
671 --- 10946,10954 ---- |
|
672 } |
|
673 #endif |
|
674 |
|
675 static void |
|
676 ex_digraphs(eap) |
|
677 ! exarg_T *eap UNUSED; |
|
678 { |
|
679 #ifdef FEAT_DIGRAPHS |
|
680 if (*eap->arg != NUL) |
|
681 *************** |
|
682 *** 11005,11014 **** |
|
683 /* |
|
684 * ":nohlsearch" |
|
685 */ |
|
686 - /*ARGSUSED*/ |
|
687 static void |
|
688 ex_nohlsearch(eap) |
|
689 ! exarg_T *eap; |
|
690 { |
|
691 no_hlsearch = TRUE; |
|
692 redraw_all_later(SOME_VALID); |
|
693 --- 10982,10990 ---- |
|
694 /* |
|
695 * ":nohlsearch" |
|
696 */ |
|
697 static void |
|
698 ex_nohlsearch(eap) |
|
699 ! exarg_T *eap UNUSED; |
|
700 { |
|
701 no_hlsearch = TRUE; |
|
702 redraw_all_later(SOME_VALID); |
|
703 *************** |
|
704 *** 11087,11096 **** |
|
705 /* |
|
706 * ":X": Get crypt key |
|
707 */ |
|
708 - /*ARGSUSED*/ |
|
709 static void |
|
710 ex_X(eap) |
|
711 ! exarg_T *eap; |
|
712 { |
|
713 (void)get_crypt_key(TRUE, TRUE); |
|
714 } |
|
715 --- 11063,11071 ---- |
|
716 /* |
|
717 * ":X": Get crypt key |
|
718 */ |
|
719 static void |
|
720 ex_X(eap) |
|
721 ! exarg_T *eap UNUSED; |
|
722 { |
|
723 (void)get_crypt_key(TRUE, TRUE); |
|
724 } |
|
725 *** ../vim-7.2.173/src/ex_getln.c 2009-04-29 18:44:38.000000000 +0200 |
|
726 --- src/ex_getln.c 2009-05-15 20:49:22.000000000 +0200 |
|
727 *************** |
|
728 *** 140,150 **** |
|
729 * Return pointer to allocated string if there is a commandline, NULL |
|
730 * otherwise. |
|
731 */ |
|
732 - /*ARGSUSED*/ |
|
733 char_u * |
|
734 getcmdline(firstc, count, indent) |
|
735 int firstc; |
|
736 ! long count; /* only used for incremental search */ |
|
737 int indent; /* indent for inside conditionals */ |
|
738 { |
|
739 int c; |
|
740 --- 140,149 ---- |
|
741 * Return pointer to allocated string if there is a commandline, NULL |
|
742 * otherwise. |
|
743 */ |
|
744 char_u * |
|
745 getcmdline(firstc, count, indent) |
|
746 int firstc; |
|
747 ! long count UNUSED; /* only used for incremental search */ |
|
748 int indent; /* indent for inside conditionals */ |
|
749 { |
|
750 int c; |
|
751 *************** |
|
752 *** 2113,2123 **** |
|
753 /* |
|
754 * Get an Ex command line for the ":" command. |
|
755 */ |
|
756 - /* ARGSUSED */ |
|
757 char_u * |
|
758 ! getexline(c, dummy, indent) |
|
759 int c; /* normally ':', NUL for ":append" */ |
|
760 ! void *dummy; /* cookie not used */ |
|
761 int indent; /* indent for inside conditionals */ |
|
762 { |
|
763 /* When executing a register, remove ':' that's in front of each line. */ |
|
764 --- 2112,2121 ---- |
|
765 /* |
|
766 * Get an Ex command line for the ":" command. |
|
767 */ |
|
768 char_u * |
|
769 ! getexline(c, cookie, indent) |
|
770 int c; /* normally ':', NUL for ":append" */ |
|
771 ! void *cookie UNUSED; |
|
772 int indent; /* indent for inside conditionals */ |
|
773 { |
|
774 /* When executing a register, remove ':' that's in front of each line. */ |
|
775 *************** |
|
776 *** 2132,2143 **** |
|
777 * mappings or abbreviations. |
|
778 * Returns a string in allocated memory or NULL. |
|
779 */ |
|
780 - /* ARGSUSED */ |
|
781 char_u * |
|
782 ! getexmodeline(promptc, dummy, indent) |
|
783 int promptc; /* normally ':', NUL for ":append" and '?' for |
|
784 :s prompt */ |
|
785 ! void *dummy; /* cookie not used */ |
|
786 int indent; /* indent for inside conditionals */ |
|
787 { |
|
788 garray_T line_ga; |
|
789 --- 2130,2140 ---- |
|
790 * mappings or abbreviations. |
|
791 * Returns a string in allocated memory or NULL. |
|
792 */ |
|
793 char_u * |
|
794 ! getexmodeline(promptc, cookie, indent) |
|
795 int promptc; /* normally ':', NUL for ":append" and '?' for |
|
796 :s prompt */ |
|
797 ! void *cookie UNUSED; |
|
798 int indent; /* indent for inside conditionals */ |
|
799 { |
|
800 garray_T line_ga; |
|
801 *************** |
|
802 *** 3832,3842 **** |
|
803 * Returns EXPAND_NOTHING when the character that triggered expansion should |
|
804 * be inserted like a normal character. |
|
805 */ |
|
806 - /*ARGSUSED*/ |
|
807 static int |
|
808 showmatches(xp, wildmenu) |
|
809 expand_T *xp; |
|
810 ! int wildmenu; |
|
811 { |
|
812 #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m]) |
|
813 int num_files; |
|
814 --- 3829,3838 ---- |
|
815 * Returns EXPAND_NOTHING when the character that triggered expansion should |
|
816 * be inserted like a normal character. |
|
817 */ |
|
818 static int |
|
819 showmatches(xp, wildmenu) |
|
820 expand_T *xp; |
|
821 ! int wildmenu UNUSED; |
|
822 { |
|
823 #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m]) |
|
824 int num_files; |
|
825 *** ../vim-7.2.173/src/fileio.c 2009-05-13 20:47:07.000000000 +0200 |
|
826 --- src/fileio.c 2009-05-15 20:52:40.000000000 +0200 |
|
827 *************** |
|
828 *** 3498,3504 **** |
|
829 if (mch_stat((char *)IObuff, &st) < 0 |
|
830 || st.st_uid != st_old.st_uid |
|
831 || st.st_gid != st_old.st_gid |
|
832 ! || st.st_mode != perm) |
|
833 backup_copy = TRUE; |
|
834 # endif |
|
835 /* Close the file before removing it, on MS-Windows we |
|
836 --- 3498,3504 ---- |
|
837 if (mch_stat((char *)IObuff, &st) < 0 |
|
838 || st.st_uid != st_old.st_uid |
|
839 || st.st_gid != st_old.st_gid |
|
840 ! || (long)st.st_mode != perm) |
|
841 backup_copy = TRUE; |
|
842 # endif |
|
843 /* Close the file before removing it, on MS-Windows we |
|
844 *************** |
|
845 *** 5963,5969 **** |
|
846 else if (*ext == '.') |
|
847 #endif |
|
848 { |
|
849 ! if (s - ptr > (size_t)8) |
|
850 { |
|
851 s = ptr + 8; |
|
852 *s = '\0'; |
|
853 --- 5971,5977 ---- |
|
854 else if (*ext == '.') |
|
855 #endif |
|
856 { |
|
857 ! if ((size_t)(s - ptr) > (size_t)8) |
|
858 { |
|
859 s = ptr + 8; |
|
860 *s = '\0'; |
|
861 *************** |
|
862 *** 6460,6470 **** |
|
863 * return 2 if a message has been displayed. |
|
864 * return 0 otherwise. |
|
865 */ |
|
866 - /*ARGSUSED*/ |
|
867 int |
|
868 buf_check_timestamp(buf, focus) |
|
869 buf_T *buf; |
|
870 ! int focus; /* called for GUI focus event */ |
|
871 { |
|
872 struct stat st; |
|
873 int stat_res; |
|
874 --- 6468,6477 ---- |
|
875 * return 2 if a message has been displayed. |
|
876 * return 0 otherwise. |
|
877 */ |
|
878 int |
|
879 buf_check_timestamp(buf, focus) |
|
880 buf_T *buf; |
|
881 ! int focus UNUSED; /* called for GUI focus event */ |
|
882 { |
|
883 struct stat st; |
|
884 int stat_res; |
|
885 *************** |
|
886 *** 6868,6879 **** |
|
887 /* Careful: autocommands may have made "buf" invalid! */ |
|
888 } |
|
889 |
|
890 - /*ARGSUSED*/ |
|
891 void |
|
892 buf_store_time(buf, st, fname) |
|
893 buf_T *buf; |
|
894 struct stat *st; |
|
895 ! char_u *fname; |
|
896 { |
|
897 buf->b_mtime = (long)st->st_mtime; |
|
898 buf->b_orig_size = (size_t)st->st_size; |
|
899 --- 6875,6885 ---- |
|
900 /* Careful: autocommands may have made "buf" invalid! */ |
|
901 } |
|
902 |
|
903 void |
|
904 buf_store_time(buf, st, fname) |
|
905 buf_T *buf; |
|
906 struct stat *st; |
|
907 ! char_u *fname UNUSED; |
|
908 { |
|
909 buf->b_mtime = (long)st->st_mtime; |
|
910 buf->b_orig_size = (size_t)st->st_size; |
|
911 *************** |
|
912 *** 6936,6945 **** |
|
913 * The returned pointer is to allocated memory. |
|
914 * The returned pointer is NULL if no valid name was found. |
|
915 */ |
|
916 - /*ARGSUSED*/ |
|
917 char_u * |
|
918 vim_tempname(extra_char) |
|
919 ! int extra_char; /* character to use in the name instead of '?' */ |
|
920 { |
|
921 #ifdef USE_TMPNAM |
|
922 char_u itmp[L_tmpnam]; /* use tmpnam() */ |
|
923 --- 6942,6950 ---- |
|
924 * The returned pointer is to allocated memory. |
|
925 * The returned pointer is NULL if no valid name was found. |
|
926 */ |
|
927 char_u * |
|
928 vim_tempname(extra_char) |
|
929 ! int extra_char UNUSED; /* char to use in the name instead of '?' */ |
|
930 { |
|
931 #ifdef USE_TMPNAM |
|
932 char_u itmp[L_tmpnam]; /* use tmpnam() */ |
|
933 *************** |
|
934 *** 6968,6974 **** |
|
935 /* |
|
936 * Try the entries in TEMPDIRNAMES to create the temp directory. |
|
937 */ |
|
938 ! for (i = 0; i < sizeof(tempdirs) / sizeof(char *); ++i) |
|
939 { |
|
940 /* expand $TMP, leave room for "/v1100000/999999999" */ |
|
941 expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20); |
|
942 --- 6973,6979 ---- |
|
943 /* |
|
944 * Try the entries in TEMPDIRNAMES to create the temp directory. |
|
945 */ |
|
946 ! for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i) |
|
947 { |
|
948 /* expand $TMP, leave room for "/v1100000/999999999" */ |
|
949 expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20); |
|
950 *************** |
|
951 *** 9588,9600 **** |
|
952 * |
|
953 * Returns NULL when out of memory. |
|
954 */ |
|
955 - /*ARGSUSED*/ |
|
956 char_u * |
|
957 file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash) |
|
958 char_u *pat; |
|
959 char_u *pat_end; /* first char after pattern or NULL */ |
|
960 char *allow_dirs; /* Result passed back out in here */ |
|
961 ! int no_bslash; /* Don't use a backward slash as pathsep */ |
|
962 { |
|
963 int size; |
|
964 char_u *endp; |
|
965 --- 9593,9604 ---- |
|
966 * |
|
967 * Returns NULL when out of memory. |
|
968 */ |
|
969 char_u * |
|
970 file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash) |
|
971 char_u *pat; |
|
972 char_u *pat_end; /* first char after pattern or NULL */ |
|
973 char *allow_dirs; /* Result passed back out in here */ |
|
974 ! int no_bslash UNUSED; /* Don't use a backward slash as pathsep */ |
|
975 { |
|
976 int size; |
|
977 char_u *endp; |
|
978 *** ../vim-7.2.173/src/misc1.c 2009-04-29 11:00:09.000000000 +0200 |
|
979 --- src/misc1.c 2009-05-15 20:59:08.000000000 +0200 |
|
980 *************** |
|
981 *** 2188,2199 **** |
|
982 * |
|
983 * return FAIL for failure, OK otherwise |
|
984 */ |
|
985 - /*ARGSUSED*/ |
|
986 int |
|
987 del_bytes(count, fixpos_arg, use_delcombine) |
|
988 long count; |
|
989 int fixpos_arg; |
|
990 ! int use_delcombine; /* 'delcombine' option applies */ |
|
991 { |
|
992 char_u *oldp, *newp; |
|
993 colnr_T oldlen; |
|
994 --- 2188,2198 ---- |
|
995 * |
|
996 * return FAIL for failure, OK otherwise |
|
997 */ |
|
998 int |
|
999 del_bytes(count, fixpos_arg, use_delcombine) |
|
1000 long count; |
|
1001 int fixpos_arg; |
|
1002 ! int use_delcombine UNUSED; /* 'delcombine' option applies */ |
|
1003 { |
|
1004 char_u *oldp, *newp; |
|
1005 colnr_T oldlen; |
|
1006 *** ../vim-7.2.173/src/move.c 2008-11-15 16:05:30.000000000 +0100 |
|
1007 --- src/move.c 2009-05-15 21:00:06.000000000 +0200 |
|
1008 *************** |
|
1009 *** 1238,1248 **** |
|
1010 /* |
|
1011 * Scroll the current window down by "line_count" logical lines. "CTRL-Y" |
|
1012 */ |
|
1013 - /*ARGSUSED*/ |
|
1014 void |
|
1015 scrolldown(line_count, byfold) |
|
1016 long line_count; |
|
1017 ! int byfold; /* TRUE: count a closed fold as one line */ |
|
1018 { |
|
1019 long done = 0; /* total # of physical lines done */ |
|
1020 int wrow; |
|
1021 --- 1238,1247 ---- |
|
1022 /* |
|
1023 * Scroll the current window down by "line_count" logical lines. "CTRL-Y" |
|
1024 */ |
|
1025 void |
|
1026 scrolldown(line_count, byfold) |
|
1027 long line_count; |
|
1028 ! int byfold UNUSED; /* TRUE: count a closed fold as one line */ |
|
1029 { |
|
1030 long done = 0; /* total # of physical lines done */ |
|
1031 int wrow; |
|
1032 *************** |
|
1033 *** 1349,1359 **** |
|
1034 /* |
|
1035 * Scroll the current window up by "line_count" logical lines. "CTRL-E" |
|
1036 */ |
|
1037 - /*ARGSUSED*/ |
|
1038 void |
|
1039 scrollup(line_count, byfold) |
|
1040 long line_count; |
|
1041 ! int byfold; /* TRUE: count a closed fold as one line */ |
|
1042 { |
|
1043 #if defined(FEAT_FOLDING) || defined(FEAT_DIFF) |
|
1044 linenr_T lnum; |
|
1045 --- 1348,1357 ---- |
|
1046 /* |
|
1047 * Scroll the current window up by "line_count" logical lines. "CTRL-E" |
|
1048 */ |
|
1049 void |
|
1050 scrollup(line_count, byfold) |
|
1051 long line_count; |
|
1052 ! int byfold UNUSED; /* TRUE: count a closed fold as one line */ |
|
1053 { |
|
1054 #if defined(FEAT_FOLDING) || defined(FEAT_DIFF) |
|
1055 linenr_T lnum; |
|
1056 *** ../vim-7.2.173/src/normal.c 2009-04-29 17:39:17.000000000 +0200 |
|
1057 --- src/normal.c 2009-05-15 21:08:07.000000000 +0200 |
|
1058 *************** |
|
1059 *** 493,506 **** |
|
1060 int i; |
|
1061 |
|
1062 /* Fill the index table with a one to one relation. */ |
|
1063 ! for (i = 0; i < NV_CMDS_SIZE; ++i) |
|
1064 nv_cmd_idx[i] = i; |
|
1065 |
|
1066 /* Sort the commands by the command character. */ |
|
1067 qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare); |
|
1068 |
|
1069 /* Find the first entry that can't be indexed by the command character. */ |
|
1070 ! for (i = 0; i < NV_CMDS_SIZE; ++i) |
|
1071 if (i != nv_cmds[nv_cmd_idx[i]].cmd_char) |
|
1072 break; |
|
1073 nv_max_linear = i - 1; |
|
1074 --- 493,506 ---- |
|
1075 int i; |
|
1076 |
|
1077 /* Fill the index table with a one to one relation. */ |
|
1078 ! for (i = 0; i < (int)NV_CMDS_SIZE; ++i) |
|
1079 nv_cmd_idx[i] = i; |
|
1080 |
|
1081 /* Sort the commands by the command character. */ |
|
1082 qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare); |
|
1083 |
|
1084 /* Find the first entry that can't be indexed by the command character. */ |
|
1085 ! for (i = 0; i < (int)NV_CMDS_SIZE; ++i) |
|
1086 if (i != nv_cmds[nv_cmd_idx[i]].cmd_char) |
|
1087 break; |
|
1088 nv_max_linear = i - 1; |
|
1089 *************** |
|
1090 *** 561,571 **** |
|
1091 /* |
|
1092 * Execute a command in Normal mode. |
|
1093 */ |
|
1094 - /*ARGSUSED*/ |
|
1095 void |
|
1096 normal_cmd(oap, toplevel) |
|
1097 oparg_T *oap; |
|
1098 ! int toplevel; /* TRUE when called from main() */ |
|
1099 { |
|
1100 cmdarg_T ca; /* command arguments */ |
|
1101 int c; |
|
1102 --- 561,570 ---- |
|
1103 /* |
|
1104 * Execute a command in Normal mode. |
|
1105 */ |
|
1106 void |
|
1107 normal_cmd(oap, toplevel) |
|
1108 oparg_T *oap; |
|
1109 ! int toplevel UNUSED; /* TRUE when called from main() */ |
|
1110 { |
|
1111 cmdarg_T ca; /* command arguments */ |
|
1112 int c; |
|
1113 *************** |
|
1114 *** 2188,2197 **** |
|
1115 /* |
|
1116 * Handle the "g@" operator: call 'operatorfunc'. |
|
1117 */ |
|
1118 - /*ARGSUSED*/ |
|
1119 static void |
|
1120 op_function(oap) |
|
1121 ! oparg_T *oap; |
|
1122 { |
|
1123 #ifdef FEAT_EVAL |
|
1124 char_u *(argv[1]); |
|
1125 --- 2187,2195 ---- |
|
1126 /* |
|
1127 * Handle the "g@" operator: call 'operatorfunc'. |
|
1128 */ |
|
1129 static void |
|
1130 op_function(oap) |
|
1131 ! oparg_T *oap UNUSED; |
|
1132 { |
|
1133 #ifdef FEAT_EVAL |
|
1134 char_u *(argv[1]); |
|
1135 *************** |
|
1136 *** 4100,4109 **** |
|
1137 * Command character that doesn't do anything, but unlike nv_ignore() does |
|
1138 * start edit(). Used for "startinsert" executed while starting up. |
|
1139 */ |
|
1140 - /*ARGSUSED */ |
|
1141 static void |
|
1142 nv_nop(cap) |
|
1143 ! cmdarg_T *cap; |
|
1144 { |
|
1145 } |
|
1146 |
|
1147 --- 4098,4106 ---- |
|
1148 * Command character that doesn't do anything, but unlike nv_ignore() does |
|
1149 * start edit(). Used for "startinsert" executed while starting up. |
|
1150 */ |
|
1151 static void |
|
1152 nv_nop(cap) |
|
1153 ! cmdarg_T *cap UNUSED; |
|
1154 { |
|
1155 } |
|
1156 |
|
1157 *************** |
|
1158 *** 5241,5247 **** |
|
1159 if (cap->oap->op_type != OP_NOP |
|
1160 && (cap->oap->start.lnum > curbuf->b_ml.ml_line_count |
|
1161 || cap->oap->start.col > |
|
1162 ! STRLEN(ml_get(cap->oap->start.lnum)))) |
|
1163 clearopbeep(cap->oap); |
|
1164 } |
|
1165 } |
|
1166 --- 5238,5244 ---- |
|
1167 if (cap->oap->op_type != OP_NOP |
|
1168 && (cap->oap->start.lnum > curbuf->b_ml.ml_line_count |
|
1169 || cap->oap->start.col > |
|
1170 ! (colnr_T)STRLEN(ml_get(cap->oap->start.lnum)))) |
|
1171 clearopbeep(cap->oap); |
|
1172 } |
|
1173 } |
|
1174 *************** |
|
1175 *** 5816,5822 **** |
|
1176 for (n = cap->count1; n > 0; --n) |
|
1177 { |
|
1178 if ((!PAST_LINE && oneright() == FAIL) |
|
1179 ! || (PAST_LINE && *ml_get_cursor() == NUL)) |
|
1180 { |
|
1181 /* |
|
1182 * <Space> wraps to next line if 'whichwrap' has 's'. |
|
1183 --- 5813,5822 ---- |
|
1184 for (n = cap->count1; n > 0; --n) |
|
1185 { |
|
1186 if ((!PAST_LINE && oneright() == FAIL) |
|
1187 ! #ifdef FEAT_VISUAL |
|
1188 ! || (PAST_LINE && *ml_get_cursor() == NUL) |
|
1189 ! #endif |
|
1190 ! ) |
|
1191 { |
|
1192 /* |
|
1193 * <Space> wraps to next line if 'whichwrap' has 's'. |
|
1194 *** ../vim-7.2.173/src/option.c 2009-03-18 15:40:03.000000000 +0100 |
|
1195 --- src/option.c 2009-05-15 21:08:50.000000000 +0200 |
|
1196 *************** |
|
1197 *** 5302,5315 **** |
|
1198 * When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is |
|
1199 * SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid". |
|
1200 */ |
|
1201 - /*ARGSUSED*/ |
|
1202 void |
|
1203 set_string_option_direct(name, opt_idx, val, opt_flags, set_sid) |
|
1204 char_u *name; |
|
1205 int opt_idx; |
|
1206 char_u *val; |
|
1207 int opt_flags; /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */ |
|
1208 ! int set_sid; |
|
1209 { |
|
1210 char_u *s; |
|
1211 char_u **varp; |
|
1212 --- 5302,5314 ---- |
|
1213 * When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is |
|
1214 * SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid". |
|
1215 */ |
|
1216 void |
|
1217 set_string_option_direct(name, opt_idx, val, opt_flags, set_sid) |
|
1218 char_u *name; |
|
1219 int opt_idx; |
|
1220 char_u *val; |
|
1221 int opt_flags; /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */ |
|
1222 ! int set_sid UNUSED; |
|
1223 { |
|
1224 char_u *s; |
|
1225 char_u **varp; |
|
1226 *************** |
|
1227 *** 9357,9366 **** |
|
1228 /* |
|
1229 * Check for NULL pointers in a winopt_T and replace them with empty_option. |
|
1230 */ |
|
1231 - /*ARGSUSED*/ |
|
1232 void |
|
1233 check_winopt(wop) |
|
1234 ! winopt_T *wop; |
|
1235 { |
|
1236 #ifdef FEAT_FOLDING |
|
1237 check_string_option(&wop->wo_fdi); |
|
1238 --- 9356,9364 ---- |
|
1239 /* |
|
1240 * Check for NULL pointers in a winopt_T and replace them with empty_option. |
|
1241 */ |
|
1242 void |
|
1243 check_winopt(wop) |
|
1244 ! winopt_T *wop UNUSED; |
|
1245 { |
|
1246 #ifdef FEAT_FOLDING |
|
1247 check_string_option(&wop->wo_fdi); |
|
1248 *************** |
|
1249 *** 9382,9391 **** |
|
1250 /* |
|
1251 * Free the allocated memory inside a winopt_T. |
|
1252 */ |
|
1253 - /*ARGSUSED*/ |
|
1254 void |
|
1255 clear_winopt(wop) |
|
1256 ! winopt_T *wop; |
|
1257 { |
|
1258 #ifdef FEAT_FOLDING |
|
1259 clear_string_option(&wop->wo_fdi); |
|
1260 --- 9380,9388 ---- |
|
1261 /* |
|
1262 * Free the allocated memory inside a winopt_T. |
|
1263 */ |
|
1264 void |
|
1265 clear_winopt(wop) |
|
1266 ! winopt_T *wop UNUSED; |
|
1267 { |
|
1268 #ifdef FEAT_FOLDING |
|
1269 clear_string_option(&wop->wo_fdi); |
|
1270 *** ../vim-7.2.173/src/os_unix.c 2009-05-13 12:46:36.000000000 +0200 |
|
1271 --- src/os_unix.c 2009-05-15 21:13:43.000000000 +0200 |
|
1272 *************** |
|
1273 *** 458,467 **** |
|
1274 * Return total amount of memory available in Kbyte. |
|
1275 * Doesn't change when memory has been allocated. |
|
1276 */ |
|
1277 - /* ARGSUSED */ |
|
1278 long_u |
|
1279 mch_total_mem(special) |
|
1280 ! int special; |
|
1281 { |
|
1282 # ifdef __EMX__ |
|
1283 return ulimit(3, 0L) >> 10; /* always 32MB? */ |
|
1284 --- 458,466 ---- |
|
1285 * Return total amount of memory available in Kbyte. |
|
1286 * Doesn't change when memory has been allocated. |
|
1287 */ |
|
1288 long_u |
|
1289 mch_total_mem(special) |
|
1290 ! int special UNUSED; |
|
1291 { |
|
1292 # ifdef __EMX__ |
|
1293 return ulimit(3, 0L) >> 10; /* always 32MB? */ |
|
1294 *************** |
|
1295 *** 815,821 **** |
|
1296 * Let me try it with a few tricky defines from my own osdef.h (jw). |
|
1297 */ |
|
1298 #if defined(SIGWINCH) |
|
1299 - /* ARGSUSED */ |
|
1300 static RETSIGTYPE |
|
1301 sig_winch SIGDEFARG(sigarg) |
|
1302 { |
|
1303 --- 814,819 ---- |
|
1304 *************** |
|
1305 *** 1355,1365 **** |
|
1306 /* |
|
1307 * Check_win checks whether we have an interactive stdout. |
|
1308 */ |
|
1309 - /* ARGSUSED */ |
|
1310 int |
|
1311 mch_check_win(argc, argv) |
|
1312 ! int argc; |
|
1313 ! char **argv; |
|
1314 { |
|
1315 #ifdef OS2 |
|
1316 /* |
|
1317 --- 1353,1362 ---- |
|
1318 /* |
|
1319 * Check_win checks whether we have an interactive stdout. |
|
1320 */ |
|
1321 int |
|
1322 mch_check_win(argc, argv) |
|
1323 ! int argc UNUSED; |
|
1324 ! char **argv UNUSED; |
|
1325 { |
|
1326 #ifdef OS2 |
|
1327 /* |
|
1328 *************** |
|
1329 *** 2467,2473 **** |
|
1330 } |
|
1331 |
|
1332 /* Catch file names which are too long. */ |
|
1333 ! if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len) |
|
1334 return FAIL; |
|
1335 |
|
1336 /* Do not append ".", "/dir/." is equal to "/dir". */ |
|
1337 --- 2464,2470 ---- |
|
1338 } |
|
1339 |
|
1340 /* Catch file names which are too long. */ |
|
1341 ! if (retval == FAIL || (int)(STRLEN(buf) + STRLEN(fname)) >= len) |
|
1342 return FAIL; |
|
1343 |
|
1344 /* Do not append ".", "/dir/." is equal to "/dir". */ |
|
1345 *************** |
|
1346 *** 2686,2692 **** |
|
1347 */ |
|
1348 vim_acl_T |
|
1349 mch_get_acl(fname) |
|
1350 ! char_u *fname; |
|
1351 { |
|
1352 vim_acl_T ret = NULL; |
|
1353 #ifdef HAVE_POSIX_ACL |
|
1354 --- 2683,2689 ---- |
|
1355 */ |
|
1356 vim_acl_T |
|
1357 mch_get_acl(fname) |
|
1358 ! char_u *fname UNUSED; |
|
1359 { |
|
1360 vim_acl_T ret = NULL; |
|
1361 #ifdef HAVE_POSIX_ACL |
|
1362 *************** |
|
1363 *** 2746,2752 **** |
|
1364 */ |
|
1365 void |
|
1366 mch_set_acl(fname, aclent) |
|
1367 ! char_u *fname; |
|
1368 vim_acl_T aclent; |
|
1369 { |
|
1370 if (aclent == NULL) |
|
1371 --- 2743,2749 ---- |
|
1372 */ |
|
1373 void |
|
1374 mch_set_acl(fname, aclent) |
|
1375 ! char_u *fname UNUSED; |
|
1376 vim_acl_T aclent; |
|
1377 { |
|
1378 if (aclent == NULL) |
|
1379 *************** |
|
1380 *** 2789,2798 **** |
|
1381 /* |
|
1382 * Set hidden flag for "name". |
|
1383 */ |
|
1384 - /* ARGSUSED */ |
|
1385 void |
|
1386 mch_hide(name) |
|
1387 ! char_u *name; |
|
1388 { |
|
1389 /* can't hide a file */ |
|
1390 } |
|
1391 --- 2786,2794 ---- |
|
1392 /* |
|
1393 * Set hidden flag for "name". |
|
1394 */ |
|
1395 void |
|
1396 mch_hide(name) |
|
1397 ! char_u *name UNUSED; |
|
1398 { |
|
1399 /* can't hide a file */ |
|
1400 } |
|
1401 *************** |
|
1402 *** 3481,3490 **** |
|
1403 /* |
|
1404 * set screen mode, always fails. |
|
1405 */ |
|
1406 - /* ARGSUSED */ |
|
1407 int |
|
1408 mch_screenmode(arg) |
|
1409 ! char_u *arg; |
|
1410 { |
|
1411 EMSG(_(e_screenmode)); |
|
1412 return FAIL; |
|
1413 --- 3477,3485 ---- |
|
1414 /* |
|
1415 * set screen mode, always fails. |
|
1416 */ |
|
1417 int |
|
1418 mch_screenmode(arg) |
|
1419 ! char_u *arg UNUSED; |
|
1420 { |
|
1421 EMSG(_(e_screenmode)); |
|
1422 return FAIL; |
|
1423 *************** |
|
1424 *** 4189,4197 **** |
|
1425 { |
|
1426 s = vim_strchr(lp + written, NL); |
|
1427 len = write(toshell_fd, (char *)lp + written, |
|
1428 ! s == NULL ? l : s - (lp + written)); |
|
1429 } |
|
1430 ! if (len == l) |
|
1431 { |
|
1432 /* Finished a line, add a NL, unless this line |
|
1433 * should not have one. */ |
|
1434 --- 4184,4193 ---- |
|
1435 { |
|
1436 s = vim_strchr(lp + written, NL); |
|
1437 len = write(toshell_fd, (char *)lp + written, |
|
1438 ! s == NULL ? l |
|
1439 ! : (size_t)(s - (lp + written))); |
|
1440 } |
|
1441 ! if (len == (int)l) |
|
1442 { |
|
1443 /* Finished a line, add a NL, unless this line |
|
1444 * should not have one. */ |
|
1445 *************** |
|
1446 *** 4746,4752 **** |
|
1447 * Returns also, when a request from Sniff is waiting -- toni. |
|
1448 * Or when a Linux GPM mouse event is waiting. |
|
1449 */ |
|
1450 - /* ARGSUSED */ |
|
1451 #if defined(__BEOS__) |
|
1452 int |
|
1453 #else |
|
1454 --- 4742,4747 ---- |
|
1455 *************** |
|
1456 *** 4755,4761 **** |
|
1457 RealWaitForChar(fd, msec, check_for_gpm) |
|
1458 int fd; |
|
1459 long msec; |
|
1460 ! int *check_for_gpm; |
|
1461 { |
|
1462 int ret; |
|
1463 #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME) |
|
1464 --- 4750,4756 ---- |
|
1465 RealWaitForChar(fd, msec, check_for_gpm) |
|
1466 int fd; |
|
1467 long msec; |
|
1468 ! int *check_for_gpm UNUSED; |
|
1469 { |
|
1470 int ret; |
|
1471 #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME) |
|
1472 *************** |
|
1473 *** 5572,5578 **** |
|
1474 i = fread((char *)buffer, 1, len, fd); |
|
1475 fclose(fd); |
|
1476 mch_remove(tempname); |
|
1477 ! if (i != len) |
|
1478 { |
|
1479 /* unexpected read error */ |
|
1480 EMSG2(_(e_notread), tempname); |
|
1481 --- 5567,5573 ---- |
|
1482 i = fread((char *)buffer, 1, len, fd); |
|
1483 fclose(fd); |
|
1484 mch_remove(tempname); |
|
1485 ! if (i != (int)len) |
|
1486 { |
|
1487 /* unexpected read error */ |
|
1488 EMSG2(_(e_notread), tempname); |
|
1489 *************** |
|
1490 *** 5633,5639 **** |
|
1491 if (shell_style == STYLE_PRINT && !did_find_nul) |
|
1492 { |
|
1493 /* If there is a NUL, set did_find_nul, else set check_spaces */ |
|
1494 ! if (len && (int)STRLEN(buffer) < len - 1) |
|
1495 did_find_nul = TRUE; |
|
1496 else |
|
1497 check_spaces = TRUE; |
|
1498 --- 5628,5634 ---- |
|
1499 if (shell_style == STYLE_PRINT && !did_find_nul) |
|
1500 { |
|
1501 /* If there is a NUL, set did_find_nul, else set check_spaces */ |
|
1502 ! if (len && (int)STRLEN(buffer) < (int)len - 1) |
|
1503 did_find_nul = TRUE; |
|
1504 else |
|
1505 check_spaces = TRUE; |
|
1506 *** ../vim-7.2.173/src/os_unix.h 2009-05-13 12:46:36.000000000 +0200 |
|
1507 --- src/os_unix.h 2009-05-15 21:10:31.000000000 +0200 |
|
1508 *************** |
|
1509 *** 126,132 **** |
|
1510 # define SIGDUMMYARG 0, 0, (struct sigcontext *)0 |
|
1511 # else |
|
1512 # define SIGPROTOARG (int) |
|
1513 ! # define SIGDEFARG(s) (s) int s; |
|
1514 # define SIGDUMMYARG 0 |
|
1515 # endif |
|
1516 #else |
|
1517 --- 126,132 ---- |
|
1518 # define SIGDUMMYARG 0, 0, (struct sigcontext *)0 |
|
1519 # else |
|
1520 # define SIGPROTOARG (int) |
|
1521 ! # define SIGDEFARG(s) (s) int s UNUSED; |
|
1522 # define SIGDUMMYARG 0 |
|
1523 # endif |
|
1524 #else |
|
1525 *** ../vim-7.2.173/src/regexp.c 2009-02-21 22:03:06.000000000 +0100 |
|
1526 --- src/regexp.c 2009-05-15 21:14:18.000000000 +0200 |
|
1527 *************** |
|
1528 *** 471,477 **** |
|
1529 |
|
1530 if ((*pp)[1] == ':') |
|
1531 { |
|
1532 ! for (i = 0; i < sizeof(class_names) / sizeof(*class_names); ++i) |
|
1533 if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0) |
|
1534 { |
|
1535 *pp += STRLEN(class_names[i]) + 2; |
|
1536 --- 471,477 ---- |
|
1537 |
|
1538 if ((*pp)[1] == ':') |
|
1539 { |
|
1540 ! for (i = 0; i < (int)(sizeof(class_names) / sizeof(*class_names)); ++i) |
|
1541 if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0) |
|
1542 { |
|
1543 *pp += STRLEN(class_names[i]) + 2; |
|
1544 *************** |
|
1545 *** 3362,3373 **** |
|
1546 * Match a regexp against a string ("line" points to the string) or multiple |
|
1547 * lines ("line" is NULL, use reg_getline()). |
|
1548 */ |
|
1549 - /*ARGSUSED*/ |
|
1550 static long |
|
1551 vim_regexec_both(line, col, tm) |
|
1552 char_u *line; |
|
1553 colnr_T col; /* column to start looking for match */ |
|
1554 ! proftime_T *tm; /* timeout limit or NULL */ |
|
1555 { |
|
1556 regprog_T *prog; |
|
1557 char_u *s; |
|
1558 --- 3362,3372 ---- |
|
1559 * Match a regexp against a string ("line" points to the string) or multiple |
|
1560 * lines ("line" is NULL, use reg_getline()). |
|
1561 */ |
|
1562 static long |
|
1563 vim_regexec_both(line, col, tm) |
|
1564 char_u *line; |
|
1565 colnr_T col; /* column to start looking for match */ |
|
1566 ! proftime_T *tm UNUSED; /* timeout limit or NULL */ |
|
1567 { |
|
1568 regprog_T *prog; |
|
1569 char_u *s; |
|
1570 *** ../vim-7.2.173/src/search.c 2009-04-22 18:43:06.000000000 +0200 |
|
1571 --- src/search.c 2009-05-15 21:16:36.000000000 +0200 |
|
1572 *************** |
|
1573 *** 522,528 **** |
|
1574 * When FEAT_EVAL is defined, returns the index of the first matching |
|
1575 * subpattern plus one; one if there was none. |
|
1576 */ |
|
1577 - /*ARGSUSED*/ |
|
1578 int |
|
1579 searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm) |
|
1580 win_T *win; /* window to search in; can be NULL for a |
|
1581 --- 522,527 ---- |
|
1582 *************** |
|
1583 *** 535,541 **** |
|
1584 int options; |
|
1585 int pat_use; /* which pattern to use when "pat" is empty */ |
|
1586 linenr_T stop_lnum; /* stop after this line number when != 0 */ |
|
1587 ! proftime_T *tm; /* timeout limit or NULL */ |
|
1588 { |
|
1589 int found; |
|
1590 linenr_T lnum; /* no init to shut up Apollo cc */ |
|
1591 --- 534,540 ---- |
|
1592 int options; |
|
1593 int pat_use; /* which pattern to use when "pat" is empty */ |
|
1594 linenr_T stop_lnum; /* stop after this line number when != 0 */ |
|
1595 ! proftime_T *tm UNUSED; /* timeout limit or NULL */ |
|
1596 { |
|
1597 int found; |
|
1598 linenr_T lnum; /* no init to shut up Apollo cc */ |
|
1599 *************** |
|
1600 *** 554,561 **** |
|
1601 int save_called_emsg = called_emsg; |
|
1602 #ifdef FEAT_SEARCH_EXTRA |
|
1603 int break_loop = FALSE; |
|
1604 - #else |
|
1605 - # define break_loop FALSE |
|
1606 #endif |
|
1607 |
|
1608 if (search_regcomp(pat, RE_SEARCH, pat_use, |
|
1609 --- 553,558 ---- |
|
1610 *************** |
|
1611 *** 940,946 **** |
|
1612 * twice. |
|
1613 */ |
|
1614 if (!p_ws || stop_lnum != 0 || got_int || called_emsg |
|
1615 ! || break_loop || found || loop) |
|
1616 break; |
|
1617 |
|
1618 /* |
|
1619 --- 937,946 ---- |
|
1620 * twice. |
|
1621 */ |
|
1622 if (!p_ws || stop_lnum != 0 || got_int || called_emsg |
|
1623 ! #ifdef FEAT_SEARCH_EXTRA |
|
1624 ! || break_loop |
|
1625 ! #endif |
|
1626 ! || found || loop) |
|
1627 break; |
|
1628 |
|
1629 /* |
|
1630 *************** |
|
1631 *** 958,964 **** |
|
1632 give_warning((char_u *)_(dir == BACKWARD |
|
1633 ? top_bot_msg : bot_top_msg), TRUE); |
|
1634 } |
|
1635 ! if (got_int || called_emsg || break_loop) |
|
1636 break; |
|
1637 } |
|
1638 while (--count > 0 && found); /* stop after count matches or no match */ |
|
1639 --- 958,968 ---- |
|
1640 give_warning((char_u *)_(dir == BACKWARD |
|
1641 ? top_bot_msg : bot_top_msg), TRUE); |
|
1642 } |
|
1643 ! if (got_int || called_emsg |
|
1644 ! #ifdef FEAT_SEARCH_EXTRA |
|
1645 ! || break_loop |
|
1646 ! #endif |
|
1647 ! ) |
|
1648 break; |
|
1649 } |
|
1650 while (--count > 0 && found); /* stop after count matches or no match */ |
|
1651 *** ../vim-7.2.173/src/tag.c 2009-02-23 00:53:35.000000000 +0100 |
|
1652 --- src/tag.c 2009-05-15 21:16:59.000000000 +0200 |
|
1653 *************** |
|
1654 *** 1105,1114 **** |
|
1655 /* |
|
1656 * Print the tag stack |
|
1657 */ |
|
1658 - /*ARGSUSED*/ |
|
1659 void |
|
1660 do_tags(eap) |
|
1661 ! exarg_T *eap; |
|
1662 { |
|
1663 int i; |
|
1664 char_u *name; |
|
1665 --- 1105,1113 ---- |
|
1666 /* |
|
1667 * Print the tag stack |
|
1668 */ |
|
1669 void |
|
1670 do_tags(eap) |
|
1671 ! exarg_T *eap UNUSED; |
|
1672 { |
|
1673 int i; |
|
1674 char_u *name; |
|
1675 *************** |
|
1676 *** 2530,2540 **** |
|
1677 * Callback function for finding all "tags" and "tags-??" files in |
|
1678 * 'runtimepath' doc directories. |
|
1679 */ |
|
1680 - /*ARGSUSED*/ |
|
1681 static void |
|
1682 found_tagfile_cb(fname, cookie) |
|
1683 char_u *fname; |
|
1684 ! void *cookie; |
|
1685 { |
|
1686 if (ga_grow(&tag_fnames, 1) == OK) |
|
1687 ((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] = |
|
1688 --- 2529,2538 ---- |
|
1689 * Callback function for finding all "tags" and "tags-??" files in |
|
1690 * 'runtimepath' doc directories. |
|
1691 */ |
|
1692 static void |
|
1693 found_tagfile_cb(fname, cookie) |
|
1694 char_u *fname; |
|
1695 ! void *cookie UNUSED; |
|
1696 { |
|
1697 if (ga_grow(&tag_fnames, 1) == OK) |
|
1698 ((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] = |
|
1699 *** ../vim-7.2.173/src/version.c 2009-05-14 22:19:19.000000000 +0200 |
|
1700 --- src/version.c 2009-05-15 21:21:44.000000000 +0200 |
|
1701 *************** |
|
1702 *** 678,679 **** |
|
1703 --- 678,681 ---- |
|
1704 { /* Add new patch number below this line */ |
|
1705 + /**/ |
|
1706 + 174, |
|
1707 /**/ |
|
1708 |
|
1709 -- |
|
1710 TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT |
|
1711 SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE |
|
1712 KILLED BY THE RABBIT) |
|
1713 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD |
|
1714 |
|
1715 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
1716 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
1717 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
1718 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|