]>
Commit | Line | Data |
---|---|---|
b5ccbaa1 ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.177 | |
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.2.177 | |
11 | Problem: Compiler warnings when using -Wextra | |
12 | Solution: Add UNUSED and type casts. | |
13 | Files: src/eval.c, src/ex_docmd.c, src/ex_eval.c, src/ex_getln.c, | |
14 | src/fileio.c, src/hardcopy.c, src/if_cscope.c, src/if_xcmdsrv.c, | |
15 | src/farsi.c, src/mark.c, src/menu.c | |
16 | ||
17 | ||
18 | *** ../vim-7.2.176/src/eval.c 2009-05-15 21:31:11.000000000 +0200 | |
19 | --- src/eval.c 2009-05-16 16:58:30.000000000 +0200 | |
20 | *************** | |
21 | *** 3772,3778 **** | |
22 | * Function given to ExpandGeneric() to obtain the list of user defined | |
23 | * (global/buffer/window/built-in) variable names. | |
24 | */ | |
25 | - /*ARGSUSED*/ | |
26 | char_u * | |
27 | get_user_var_name(xp, idx) | |
28 | expand_T *xp; | |
29 | --- 3772,3777 ---- | |
30 | *************** | |
31 | *** 7787,7793 **** | |
32 | * Function given to ExpandGeneric() to obtain the list of internal or | |
33 | * user defined variable or function names. | |
34 | */ | |
35 | - /*ARGSUSED*/ | |
36 | char_u * | |
37 | get_expr_name(xp, idx) | |
38 | expand_T *xp; | |
39 | --- 7786,7791 ---- | |
40 | *************** | |
41 | *** 8655,8664 **** | |
42 | /* | |
43 | * "byte2line(byte)" function | |
44 | */ | |
45 | - /*ARGSUSED*/ | |
46 | static void | |
47 | f_byte2line(argvars, rettv) | |
48 | ! typval_T *argvars; | |
49 | typval_T *rettv; | |
50 | { | |
51 | #ifndef FEAT_BYTEOFF | |
52 | --- 8653,8661 ---- | |
53 | /* | |
54 | * "byte2line(byte)" function | |
55 | */ | |
56 | static void | |
57 | f_byte2line(argvars, rettv) | |
58 | ! typval_T *argvars UNUSED; | |
59 | typval_T *rettv; | |
60 | { | |
61 | #ifndef FEAT_BYTEOFF | |
62 | *************** | |
63 | *** 8678,8684 **** | |
64 | /* | |
65 | * "byteidx()" function | |
66 | */ | |
67 | - /*ARGSUSED*/ | |
68 | static void | |
69 | f_byteidx(argvars, rettv) | |
70 | typval_T *argvars; | |
71 | --- 8675,8680 ---- | |
72 | *************** | |
73 | *** 8852,8858 **** | |
74 | static void | |
75 | f_clearmatches(argvars, rettv) | |
76 | typval_T *argvars UNUSED; | |
77 | ! typval_T *rettv; | |
78 | { | |
79 | #ifdef FEAT_SEARCH_EXTRA | |
80 | clear_matches(curwin); | |
81 | --- 8848,8854 ---- | |
82 | static void | |
83 | f_clearmatches(argvars, rettv) | |
84 | typval_T *argvars UNUSED; | |
85 | ! typval_T *rettv UNUSED; | |
86 | { | |
87 | #ifdef FEAT_SEARCH_EXTRA | |
88 | clear_matches(curwin); | |
89 | *************** | |
90 | *** 8916,8926 **** | |
91 | /* | |
92 | * "complete()" function | |
93 | */ | |
94 | - /*ARGSUSED*/ | |
95 | static void | |
96 | f_complete(argvars, rettv) | |
97 | typval_T *argvars; | |
98 | ! typval_T *rettv; | |
99 | { | |
100 | int startcol; | |
101 | ||
102 | --- 8912,8921 ---- | |
103 | /* | |
104 | * "complete()" function | |
105 | */ | |
106 | static void | |
107 | f_complete(argvars, rettv) | |
108 | typval_T *argvars; | |
109 | ! typval_T *rettv UNUSED; | |
110 | { | |
111 | int startcol; | |
112 | ||
113 | *************** | |
114 | *** 8951,8957 **** | |
115 | /* | |
116 | * "complete_add()" function | |
117 | */ | |
118 | - /*ARGSUSED*/ | |
119 | static void | |
120 | f_complete_add(argvars, rettv) | |
121 | typval_T *argvars; | |
122 | --- 8946,8951 ---- | |
123 | *************** | |
124 | *** 8963,8972 **** | |
125 | /* | |
126 | * "complete_check()" function | |
127 | */ | |
128 | - /*ARGSUSED*/ | |
129 | static void | |
130 | f_complete_check(argvars, rettv) | |
131 | ! typval_T *argvars; | |
132 | typval_T *rettv; | |
133 | { | |
134 | int saved = RedrawingDisabled; | |
135 | --- 8957,8965 ---- | |
136 | /* | |
137 | * "complete_check()" function | |
138 | */ | |
139 | static void | |
140 | f_complete_check(argvars, rettv) | |
141 | ! typval_T *argvars UNUSED; | |
142 | typval_T *rettv; | |
143 | { | |
144 | int saved = RedrawingDisabled; | |
145 | *************** | |
146 | *** 8981,8991 **** | |
147 | /* | |
148 | * "confirm(message, buttons[, default [, type]])" function | |
149 | */ | |
150 | - /*ARGSUSED*/ | |
151 | static void | |
152 | f_confirm(argvars, rettv) | |
153 | ! typval_T *argvars; | |
154 | ! typval_T *rettv; | |
155 | { | |
156 | #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) | |
157 | char_u *message; | |
158 | --- 8974,8983 ---- | |
159 | /* | |
160 | * "confirm(message, buttons[, default [, type]])" function | |
161 | */ | |
162 | static void | |
163 | f_confirm(argvars, rettv) | |
164 | ! typval_T *argvars UNUSED; | |
165 | ! typval_T *rettv UNUSED; | |
166 | { | |
167 | #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) | |
168 | char_u *message; | |
169 | *************** | |
170 | *** 9150,9160 **** | |
171 | * | |
172 | * Checks the existence of a cscope connection. | |
173 | */ | |
174 | - /*ARGSUSED*/ | |
175 | static void | |
176 | f_cscope_connection(argvars, rettv) | |
177 | ! typval_T *argvars; | |
178 | ! typval_T *rettv; | |
179 | { | |
180 | #ifdef FEAT_CSCOPE | |
181 | int num = 0; | |
182 | --- 9142,9151 ---- | |
183 | * | |
184 | * Checks the existence of a cscope connection. | |
185 | */ | |
186 | static void | |
187 | f_cscope_connection(argvars, rettv) | |
188 | ! typval_T *argvars UNUSED; | |
189 | ! typval_T *rettv UNUSED; | |
190 | { | |
191 | #ifdef FEAT_CSCOPE | |
192 | int num = 0; | |
193 | *************** | |
194 | *** 9181,9187 **** | |
195 | * Moves the cursor to the specified line and column. | |
196 | * Returns 0 when the position could be set, -1 otherwise. | |
197 | */ | |
198 | - /*ARGSUSED*/ | |
199 | static void | |
200 | f_cursor(argvars, rettv) | |
201 | typval_T *argvars; | |
202 | --- 9172,9177 ---- | |
203 | *************** | |
204 | *** 9275,9285 **** | |
205 | /* | |
206 | * "did_filetype()" function | |
207 | */ | |
208 | - /*ARGSUSED*/ | |
209 | static void | |
210 | f_did_filetype(argvars, rettv) | |
211 | ! typval_T *argvars; | |
212 | ! typval_T *rettv; | |
213 | { | |
214 | #ifdef FEAT_AUTOCMD | |
215 | rettv->vval.v_number = did_filetype; | |
216 | --- 9265,9274 ---- | |
217 | /* | |
218 | * "did_filetype()" function | |
219 | */ | |
220 | static void | |
221 | f_did_filetype(argvars, rettv) | |
222 | ! typval_T *argvars UNUSED; | |
223 | ! typval_T *rettv UNUSED; | |
224 | { | |
225 | #ifdef FEAT_AUTOCMD | |
226 | rettv->vval.v_number = did_filetype; | |
227 | *************** | |
228 | *** 9289,9299 **** | |
229 | /* | |
230 | * "diff_filler()" function | |
231 | */ | |
232 | - /*ARGSUSED*/ | |
233 | static void | |
234 | f_diff_filler(argvars, rettv) | |
235 | ! typval_T *argvars; | |
236 | ! typval_T *rettv; | |
237 | { | |
238 | #ifdef FEAT_DIFF | |
239 | rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars)); | |
240 | --- 9278,9287 ---- | |
241 | /* | |
242 | * "diff_filler()" function | |
243 | */ | |
244 | static void | |
245 | f_diff_filler(argvars, rettv) | |
246 | ! typval_T *argvars UNUSED; | |
247 | ! typval_T *rettv UNUSED; | |
248 | { | |
249 | #ifdef FEAT_DIFF | |
250 | rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars)); | |
251 | *************** | |
252 | *** 9303,9313 **** | |
253 | /* | |
254 | * "diff_hlID()" function | |
255 | */ | |
256 | - /*ARGSUSED*/ | |
257 | static void | |
258 | f_diff_hlID(argvars, rettv) | |
259 | ! typval_T *argvars; | |
260 | ! typval_T *rettv; | |
261 | { | |
262 | #ifdef FEAT_DIFF | |
263 | linenr_T lnum = get_tv_lnum(argvars); | |
264 | --- 9291,9300 ---- | |
265 | /* | |
266 | * "diff_hlID()" function | |
267 | */ | |
268 | static void | |
269 | f_diff_hlID(argvars, rettv) | |
270 | ! typval_T *argvars UNUSED; | |
271 | ! typval_T *rettv UNUSED; | |
272 | { | |
273 | #ifdef FEAT_DIFF | |
274 | linenr_T lnum = get_tv_lnum(argvars); | |
275 | *************** | |
276 | *** 9420,9426 **** | |
277 | /* | |
278 | * "eval()" function | |
279 | */ | |
280 | - /*ARGSUSED*/ | |
281 | static void | |
282 | f_eval(argvars, rettv) | |
283 | typval_T *argvars; | |
284 | --- 9407,9412 ---- | |
285 | *************** | |
286 | *** 9444,9453 **** | |
287 | /* | |
288 | * "eventhandler()" function | |
289 | */ | |
290 | - /*ARGSUSED*/ | |
291 | static void | |
292 | f_eventhandler(argvars, rettv) | |
293 | ! typval_T *argvars; | |
294 | typval_T *rettv; | |
295 | { | |
296 | rettv->vval.v_number = vgetc_busy; | |
297 | --- 9430,9438 ---- | |
298 | /* | |
299 | * "eventhandler()" function | |
300 | */ | |
301 | static void | |
302 | f_eventhandler(argvars, rettv) | |
303 | ! typval_T *argvars UNUSED; | |
304 | typval_T *rettv; | |
305 | { | |
306 | rettv->vval.v_number = vgetc_busy; | |
307 | *************** | |
308 | *** 9704,9714 **** | |
309 | /* | |
310 | * "feedkeys()" function | |
311 | */ | |
312 | - /*ARGSUSED*/ | |
313 | static void | |
314 | f_feedkeys(argvars, rettv) | |
315 | typval_T *argvars; | |
316 | ! typval_T *rettv; | |
317 | { | |
318 | int remap = TRUE; | |
319 | char_u *keys, *flags; | |
320 | --- 9689,9698 ---- | |
321 | /* | |
322 | * "feedkeys()" function | |
323 | */ | |
324 | static void | |
325 | f_feedkeys(argvars, rettv) | |
326 | typval_T *argvars; | |
327 | ! typval_T *rettv UNUSED; | |
328 | { | |
329 | int remap = TRUE; | |
330 | char_u *keys, *flags; | |
331 | *************** | |
332 | *** 10210,10219 **** | |
333 | /* | |
334 | * "foldtext()" function | |
335 | */ | |
336 | - /*ARGSUSED*/ | |
337 | static void | |
338 | f_foldtext(argvars, rettv) | |
339 | ! typval_T *argvars; | |
340 | typval_T *rettv; | |
341 | { | |
342 | #ifdef FEAT_FOLDING | |
343 | --- 10194,10202 ---- | |
344 | /* | |
345 | * "foldtext()" function | |
346 | */ | |
347 | static void | |
348 | f_foldtext(argvars, rettv) | |
349 | ! typval_T *argvars UNUSED; | |
350 | typval_T *rettv; | |
351 | { | |
352 | #ifdef FEAT_FOLDING | |
353 | *************** | |
354 | *** 10278,10287 **** | |
355 | /* | |
356 | * "foldtextresult(lnum)" function | |
357 | */ | |
358 | - /*ARGSUSED*/ | |
359 | static void | |
360 | f_foldtextresult(argvars, rettv) | |
361 | ! typval_T *argvars; | |
362 | typval_T *rettv; | |
363 | { | |
364 | #ifdef FEAT_FOLDING | |
365 | --- 10261,10269 ---- | |
366 | /* | |
367 | * "foldtextresult(lnum)" function | |
368 | */ | |
369 | static void | |
370 | f_foldtextresult(argvars, rettv) | |
371 | ! typval_T *argvars UNUSED; | |
372 | typval_T *rettv; | |
373 | { | |
374 | #ifdef FEAT_FOLDING | |
375 | *************** | |
376 | *** 10314,10324 **** | |
377 | /* | |
378 | * "foreground()" function | |
379 | */ | |
380 | - /*ARGSUSED*/ | |
381 | static void | |
382 | f_foreground(argvars, rettv) | |
383 | ! typval_T *argvars; | |
384 | ! typval_T *rettv; | |
385 | { | |
386 | #ifdef FEAT_GUI | |
387 | if (gui.in_use) | |
388 | --- 10296,10305 ---- | |
389 | /* | |
390 | * "foreground()" function | |
391 | */ | |
392 | static void | |
393 | f_foreground(argvars, rettv) | |
394 | ! typval_T *argvars UNUSED; | |
395 | ! typval_T *rettv UNUSED; | |
396 | { | |
397 | #ifdef FEAT_GUI | |
398 | if (gui.in_use) | |
399 | *************** | |
400 | *** 10333,10339 **** | |
401 | /* | |
402 | * "function()" function | |
403 | */ | |
404 | - /*ARGSUSED*/ | |
405 | static void | |
406 | f_function(argvars, rettv) | |
407 | typval_T *argvars; | |
408 | --- 10314,10319 ---- | |
409 | *************** | |
410 | *** 10357,10367 **** | |
411 | /* | |
412 | * "garbagecollect()" function | |
413 | */ | |
414 | - /*ARGSUSED*/ | |
415 | static void | |
416 | f_garbagecollect(argvars, rettv) | |
417 | typval_T *argvars; | |
418 | ! typval_T *rettv; | |
419 | { | |
420 | /* This is postponed until we are back at the toplevel, because we may be | |
421 | * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */ | |
422 | --- 10337,10346 ---- | |
423 | /* | |
424 | * "garbagecollect()" function | |
425 | */ | |
426 | static void | |
427 | f_garbagecollect(argvars, rettv) | |
428 | typval_T *argvars; | |
429 | ! typval_T *rettv UNUSED; | |
430 | { | |
431 | /* This is postponed until we are back at the toplevel, because we may be | |
432 | * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */ | |
433 | *************** | |
434 | *** 10664,10673 **** | |
435 | /* | |
436 | * "getcharmod()" function | |
437 | */ | |
438 | - /*ARGSUSED*/ | |
439 | static void | |
440 | f_getcharmod(argvars, rettv) | |
441 | ! typval_T *argvars; | |
442 | typval_T *rettv; | |
443 | { | |
444 | rettv->vval.v_number = mod_mask; | |
445 | --- 10643,10651 ---- | |
446 | /* | |
447 | * "getcharmod()" function | |
448 | */ | |
449 | static void | |
450 | f_getcharmod(argvars, rettv) | |
451 | ! typval_T *argvars UNUSED; | |
452 | typval_T *rettv; | |
453 | { | |
454 | rettv->vval.v_number = mod_mask; | |
455 | *************** | |
456 | *** 10676,10685 **** | |
457 | /* | |
458 | * "getcmdline()" function | |
459 | */ | |
460 | - /*ARGSUSED*/ | |
461 | static void | |
462 | f_getcmdline(argvars, rettv) | |
463 | ! typval_T *argvars; | |
464 | typval_T *rettv; | |
465 | { | |
466 | rettv->v_type = VAR_STRING; | |
467 | --- 10654,10662 ---- | |
468 | /* | |
469 | * "getcmdline()" function | |
470 | */ | |
471 | static void | |
472 | f_getcmdline(argvars, rettv) | |
473 | ! typval_T *argvars UNUSED; | |
474 | typval_T *rettv; | |
475 | { | |
476 | rettv->v_type = VAR_STRING; | |
477 | *************** | |
478 | *** 10689,10698 **** | |
479 | /* | |
480 | * "getcmdpos()" function | |
481 | */ | |
482 | - /*ARGSUSED*/ | |
483 | static void | |
484 | f_getcmdpos(argvars, rettv) | |
485 | ! typval_T *argvars; | |
486 | typval_T *rettv; | |
487 | { | |
488 | rettv->vval.v_number = get_cmdline_pos() + 1; | |
489 | --- 10666,10674 ---- | |
490 | /* | |
491 | * "getcmdpos()" function | |
492 | */ | |
493 | static void | |
494 | f_getcmdpos(argvars, rettv) | |
495 | ! typval_T *argvars UNUSED; | |
496 | typval_T *rettv; | |
497 | { | |
498 | rettv->vval.v_number = get_cmdline_pos() + 1; | |
499 | *************** | |
500 | *** 10701,10710 **** | |
501 | /* | |
502 | * "getcmdtype()" function | |
503 | */ | |
504 | - /*ARGSUSED*/ | |
505 | static void | |
506 | f_getcmdtype(argvars, rettv) | |
507 | ! typval_T *argvars; | |
508 | typval_T *rettv; | |
509 | { | |
510 | rettv->v_type = VAR_STRING; | |
511 | --- 10677,10685 ---- | |
512 | /* | |
513 | * "getcmdtype()" function | |
514 | */ | |
515 | static void | |
516 | f_getcmdtype(argvars, rettv) | |
517 | ! typval_T *argvars UNUSED; | |
518 | typval_T *rettv; | |
519 | { | |
520 | rettv->v_type = VAR_STRING; | |
521 | *************** | |
522 | *** 10719,10728 **** | |
523 | /* | |
524 | * "getcwd()" function | |
525 | */ | |
526 | - /*ARGSUSED*/ | |
527 | static void | |
528 | f_getcwd(argvars, rettv) | |
529 | ! typval_T *argvars; | |
530 | typval_T *rettv; | |
531 | { | |
532 | char_u cwd[MAXPATHL]; | |
533 | --- 10694,10702 ---- | |
534 | /* | |
535 | * "getcwd()" function | |
536 | */ | |
537 | static void | |
538 | f_getcwd(argvars, rettv) | |
539 | ! typval_T *argvars UNUSED; | |
540 | typval_T *rettv; | |
541 | { | |
542 | char_u cwd[MAXPATHL]; | |
543 | *************** | |
544 | *** 10743,10752 **** | |
545 | /* | |
546 | * "getfontname()" function | |
547 | */ | |
548 | - /*ARGSUSED*/ | |
549 | static void | |
550 | f_getfontname(argvars, rettv) | |
551 | ! typval_T *argvars; | |
552 | typval_T *rettv; | |
553 | { | |
554 | rettv->v_type = VAR_STRING; | |
555 | --- 10717,10725 ---- | |
556 | /* | |
557 | * "getfontname()" function | |
558 | */ | |
559 | static void | |
560 | f_getfontname(argvars, rettv) | |
561 | ! typval_T *argvars UNUSED; | |
562 | typval_T *rettv; | |
563 | { | |
564 | rettv->v_type = VAR_STRING; | |
565 | *************** | |
566 | *** 10973,10982 **** | |
567 | /* | |
568 | * "getmatches()" function | |
569 | */ | |
570 | - /*ARGSUSED*/ | |
571 | static void | |
572 | f_getmatches(argvars, rettv) | |
573 | ! typval_T *argvars; | |
574 | typval_T *rettv; | |
575 | { | |
576 | #ifdef FEAT_SEARCH_EXTRA | |
577 | --- 10946,10954 ---- | |
578 | /* | |
579 | * "getmatches()" function | |
580 | */ | |
581 | static void | |
582 | f_getmatches(argvars, rettv) | |
583 | ! typval_T *argvars UNUSED; | |
584 | typval_T *rettv; | |
585 | { | |
586 | #ifdef FEAT_SEARCH_EXTRA | |
587 | *************** | |
588 | *** 11004,11013 **** | |
589 | /* | |
590 | * "getpid()" function | |
591 | */ | |
592 | - /*ARGSUSED*/ | |
593 | static void | |
594 | f_getpid(argvars, rettv) | |
595 | ! typval_T *argvars; | |
596 | typval_T *rettv; | |
597 | { | |
598 | rettv->vval.v_number = mch_get_pid(); | |
599 | --- 10976,10984 ---- | |
600 | /* | |
601 | * "getpid()" function | |
602 | */ | |
603 | static void | |
604 | f_getpid(argvars, rettv) | |
605 | ! typval_T *argvars UNUSED; | |
606 | typval_T *rettv; | |
607 | { | |
608 | rettv->vval.v_number = mch_get_pid(); | |
609 | *************** | |
610 | *** 11051,11061 **** | |
611 | /* | |
612 | * "getqflist()" and "getloclist()" functions | |
613 | */ | |
614 | - /*ARGSUSED*/ | |
615 | static void | |
616 | f_getqflist(argvars, rettv) | |
617 | ! typval_T *argvars; | |
618 | ! typval_T *rettv; | |
619 | { | |
620 | #ifdef FEAT_QUICKFIX | |
621 | win_T *wp; | |
622 | --- 11022,11031 ---- | |
623 | /* | |
624 | * "getqflist()" and "getloclist()" functions | |
625 | */ | |
626 | static void | |
627 | f_getqflist(argvars, rettv) | |
628 | ! typval_T *argvars UNUSED; | |
629 | ! typval_T *rettv UNUSED; | |
630 | { | |
631 | #ifdef FEAT_QUICKFIX | |
632 | win_T *wp; | |
633 | *************** | |
634 | *** 11170,11179 **** | |
635 | /* | |
636 | * "getwinposx()" function | |
637 | */ | |
638 | - /*ARGSUSED*/ | |
639 | static void | |
640 | f_getwinposx(argvars, rettv) | |
641 | ! typval_T *argvars; | |
642 | typval_T *rettv; | |
643 | { | |
644 | rettv->vval.v_number = -1; | |
645 | --- 11140,11148 ---- | |
646 | /* | |
647 | * "getwinposx()" function | |
648 | */ | |
649 | static void | |
650 | f_getwinposx(argvars, rettv) | |
651 | ! typval_T *argvars UNUSED; | |
652 | typval_T *rettv; | |
653 | { | |
654 | rettv->vval.v_number = -1; | |
655 | *************** | |
656 | *** 11191,11200 **** | |
657 | /* | |
658 | * "getwinposy()" function | |
659 | */ | |
660 | - /*ARGSUSED*/ | |
661 | static void | |
662 | f_getwinposy(argvars, rettv) | |
663 | ! typval_T *argvars; | |
664 | typval_T *rettv; | |
665 | { | |
666 | rettv->vval.v_number = -1; | |
667 | --- 11160,11168 ---- | |
668 | /* | |
669 | * "getwinposy()" function | |
670 | */ | |
671 | static void | |
672 | f_getwinposy(argvars, rettv) | |
673 | ! typval_T *argvars UNUSED; | |
674 | typval_T *rettv; | |
675 | { | |
676 | rettv->vval.v_number = -1; | |
677 | *************** | |
678 | *** 11921,11930 **** | |
679 | /* | |
680 | * "haslocaldir()" function | |
681 | */ | |
682 | - /*ARGSUSED*/ | |
683 | static void | |
684 | f_haslocaldir(argvars, rettv) | |
685 | ! typval_T *argvars; | |
686 | typval_T *rettv; | |
687 | { | |
688 | rettv->vval.v_number = (curwin->w_localdir != NULL); | |
689 | --- 11889,11897 ---- | |
690 | /* | |
691 | * "haslocaldir()" function | |
692 | */ | |
693 | static void | |
694 | f_haslocaldir(argvars, rettv) | |
695 | ! typval_T *argvars UNUSED; | |
696 | typval_T *rettv; | |
697 | { | |
698 | rettv->vval.v_number = (curwin->w_localdir != NULL); | |
699 | *************** | |
700 | *** 11962,11971 **** | |
701 | /* | |
702 | * "histadd()" function | |
703 | */ | |
704 | - /*ARGSUSED*/ | |
705 | static void | |
706 | f_histadd(argvars, rettv) | |
707 | ! typval_T *argvars; | |
708 | typval_T *rettv; | |
709 | { | |
710 | #ifdef FEAT_CMDHIST | |
711 | --- 11929,11937 ---- | |
712 | /* | |
713 | * "histadd()" function | |
714 | */ | |
715 | static void | |
716 | f_histadd(argvars, rettv) | |
717 | ! typval_T *argvars UNUSED; | |
718 | typval_T *rettv; | |
719 | { | |
720 | #ifdef FEAT_CMDHIST | |
721 | *************** | |
722 | *** 11996,12006 **** | |
723 | /* | |
724 | * "histdel()" function | |
725 | */ | |
726 | - /*ARGSUSED*/ | |
727 | static void | |
728 | f_histdel(argvars, rettv) | |
729 | ! typval_T *argvars; | |
730 | ! typval_T *rettv; | |
731 | { | |
732 | #ifdef FEAT_CMDHIST | |
733 | int n; | |
734 | --- 11962,11971 ---- | |
735 | /* | |
736 | * "histdel()" function | |
737 | */ | |
738 | static void | |
739 | f_histdel(argvars, rettv) | |
740 | ! typval_T *argvars UNUSED; | |
741 | ! typval_T *rettv UNUSED; | |
742 | { | |
743 | #ifdef FEAT_CMDHIST | |
744 | int n; | |
745 | *************** | |
746 | *** 12028,12037 **** | |
747 | /* | |
748 | * "histget()" function | |
749 | */ | |
750 | - /*ARGSUSED*/ | |
751 | static void | |
752 | f_histget(argvars, rettv) | |
753 | ! typval_T *argvars; | |
754 | typval_T *rettv; | |
755 | { | |
756 | #ifdef FEAT_CMDHIST | |
757 | --- 11993,12001 ---- | |
758 | /* | |
759 | * "histget()" function | |
760 | */ | |
761 | static void | |
762 | f_histget(argvars, rettv) | |
763 | ! typval_T *argvars UNUSED; | |
764 | typval_T *rettv; | |
765 | { | |
766 | #ifdef FEAT_CMDHIST | |
767 | *************** | |
768 | *** 12061,12070 **** | |
769 | /* | |
770 | * "histnr()" function | |
771 | */ | |
772 | - /*ARGSUSED*/ | |
773 | static void | |
774 | f_histnr(argvars, rettv) | |
775 | ! typval_T *argvars; | |
776 | typval_T *rettv; | |
777 | { | |
778 | int i; | |
779 | --- 12025,12033 ---- | |
780 | /* | |
781 | * "histnr()" function | |
782 | */ | |
783 | static void | |
784 | f_histnr(argvars, rettv) | |
785 | ! typval_T *argvars UNUSED; | |
786 | typval_T *rettv; | |
787 | { | |
788 | int i; | |
789 | *************** | |
790 | *** 12106,12115 **** | |
791 | /* | |
792 | * "hostname()" function | |
793 | */ | |
794 | - /*ARGSUSED*/ | |
795 | static void | |
796 | f_hostname(argvars, rettv) | |
797 | ! typval_T *argvars; | |
798 | typval_T *rettv; | |
799 | { | |
800 | char_u hostname[256]; | |
801 | --- 12069,12077 ---- | |
802 | /* | |
803 | * "hostname()" function | |
804 | */ | |
805 | static void | |
806 | f_hostname(argvars, rettv) | |
807 | ! typval_T *argvars UNUSED; | |
808 | typval_T *rettv; | |
809 | { | |
810 | char_u hostname[256]; | |
811 | *************** | |
812 | *** 12122,12131 **** | |
813 | /* | |
814 | * iconv() function | |
815 | */ | |
816 | - /*ARGSUSED*/ | |
817 | static void | |
818 | f_iconv(argvars, rettv) | |
819 | ! typval_T *argvars; | |
820 | typval_T *rettv; | |
821 | { | |
822 | #ifdef FEAT_MBYTE | |
823 | --- 12084,12092 ---- | |
824 | /* | |
825 | * iconv() function | |
826 | */ | |
827 | static void | |
828 | f_iconv(argvars, rettv) | |
829 | ! typval_T *argvars UNUSED; | |
830 | typval_T *rettv; | |
831 | { | |
832 | #ifdef FEAT_MBYTE | |
833 | *************** | |
834 | *** 12420,12429 **** | |
835 | /* | |
836 | * "inputrestore()" function | |
837 | */ | |
838 | - /*ARGSUSED*/ | |
839 | static void | |
840 | f_inputrestore(argvars, rettv) | |
841 | ! typval_T *argvars; | |
842 | typval_T *rettv; | |
843 | { | |
844 | if (ga_userinput.ga_len > 0) | |
845 | --- 12381,12389 ---- | |
846 | /* | |
847 | * "inputrestore()" function | |
848 | */ | |
849 | static void | |
850 | f_inputrestore(argvars, rettv) | |
851 | ! typval_T *argvars UNUSED; | |
852 | typval_T *rettv; | |
853 | { | |
854 | if (ga_userinput.ga_len > 0) | |
855 | *************** | |
856 | *** 12443,12452 **** | |
857 | /* | |
858 | * "inputsave()" function | |
859 | */ | |
860 | - /*ARGSUSED*/ | |
861 | static void | |
862 | f_inputsave(argvars, rettv) | |
863 | ! typval_T *argvars; | |
864 | typval_T *rettv; | |
865 | { | |
866 | /* Add an entry to the stack of typeahead storage. */ | |
867 | --- 12403,12411 ---- | |
868 | /* | |
869 | * "inputsave()" function | |
870 | */ | |
871 | static void | |
872 | f_inputsave(argvars, rettv) | |
873 | ! typval_T *argvars UNUSED; | |
874 | typval_T *rettv; | |
875 | { | |
876 | /* Add an entry to the stack of typeahead storage. */ | |
877 | *************** | |
878 | *** 12733,12742 **** | |
879 | /* | |
880 | * "last_buffer_nr()" function. | |
881 | */ | |
882 | - /*ARGSUSED*/ | |
883 | static void | |
884 | f_last_buffer_nr(argvars, rettv) | |
885 | ! typval_T *argvars; | |
886 | typval_T *rettv; | |
887 | { | |
888 | int n = 0; | |
889 | --- 12692,12700 ---- | |
890 | /* | |
891 | * "last_buffer_nr()" function. | |
892 | */ | |
893 | static void | |
894 | f_last_buffer_nr(argvars, rettv) | |
895 | ! typval_T *argvars UNUSED; | |
896 | typval_T *rettv; | |
897 | { | |
898 | int n = 0; | |
899 | *************** | |
900 | *** 12863,12872 **** | |
901 | /* | |
902 | * "line2byte(lnum)" function | |
903 | */ | |
904 | - /*ARGSUSED*/ | |
905 | static void | |
906 | f_line2byte(argvars, rettv) | |
907 | ! typval_T *argvars; | |
908 | typval_T *rettv; | |
909 | { | |
910 | #ifndef FEAT_BYTEOFF | |
911 | --- 12821,12829 ---- | |
912 | /* | |
913 | * "line2byte(lnum)" function | |
914 | */ | |
915 | static void | |
916 | f_line2byte(argvars, rettv) | |
917 | ! typval_T *argvars UNUSED; | |
918 | typval_T *rettv; | |
919 | { | |
920 | #ifndef FEAT_BYTEOFF | |
921 | *************** | |
922 | *** 12912,12921 **** | |
923 | /* | |
924 | * "localtime()" function | |
925 | */ | |
926 | - /*ARGSUSED*/ | |
927 | static void | |
928 | f_localtime(argvars, rettv) | |
929 | ! typval_T *argvars; | |
930 | typval_T *rettv; | |
931 | { | |
932 | rettv->vval.v_number = (varnumber_T)time(NULL); | |
933 | --- 12869,12877 ---- | |
934 | /* | |
935 | * "localtime()" function | |
936 | */ | |
937 | static void | |
938 | f_localtime(argvars, rettv) | |
939 | ! typval_T *argvars UNUSED; | |
940 | typval_T *rettv; | |
941 | { | |
942 | rettv->vval.v_number = (varnumber_T)time(NULL); | |
943 | *************** | |
944 | *** 13497,13503 **** | |
945 | /* | |
946 | * "mode()" function | |
947 | */ | |
948 | - /*ARGSUSED*/ | |
949 | static void | |
950 | f_mode(argvars, rettv) | |
951 | typval_T *argvars; | |
952 | --- 13453,13458 ---- | |
953 | *************** | |
954 | *** 13726,13736 **** | |
955 | /* | |
956 | * "pumvisible()" function | |
957 | */ | |
958 | - /*ARGSUSED*/ | |
959 | static void | |
960 | f_pumvisible(argvars, rettv) | |
961 | ! typval_T *argvars; | |
962 | ! typval_T *rettv; | |
963 | { | |
964 | #ifdef FEAT_INS_EXPAND | |
965 | if (pum_visible()) | |
966 | --- 13681,13690 ---- | |
967 | /* | |
968 | * "pumvisible()" function | |
969 | */ | |
970 | static void | |
971 | f_pumvisible(argvars, rettv) | |
972 | ! typval_T *argvars UNUSED; | |
973 | ! typval_T *rettv UNUSED; | |
974 | { | |
975 | #ifdef FEAT_INS_EXPAND | |
976 | if (pum_visible()) | |
977 | *************** | |
978 | *** 14131,14140 **** | |
979 | /* | |
980 | * "remote_expr()" function | |
981 | */ | |
982 | - /*ARGSUSED*/ | |
983 | static void | |
984 | f_remote_expr(argvars, rettv) | |
985 | ! typval_T *argvars; | |
986 | typval_T *rettv; | |
987 | { | |
988 | rettv->v_type = VAR_STRING; | |
989 | --- 14085,14093 ---- | |
990 | /* | |
991 | * "remote_expr()" function | |
992 | */ | |
993 | static void | |
994 | f_remote_expr(argvars, rettv) | |
995 | ! typval_T *argvars UNUSED; | |
996 | typval_T *rettv; | |
997 | { | |
998 | rettv->v_type = VAR_STRING; | |
999 | *************** | |
1000 | *** 14147,14157 **** | |
1001 | /* | |
1002 | * "remote_foreground()" function | |
1003 | */ | |
1004 | - /*ARGSUSED*/ | |
1005 | static void | |
1006 | f_remote_foreground(argvars, rettv) | |
1007 | ! typval_T *argvars; | |
1008 | ! typval_T *rettv; | |
1009 | { | |
1010 | #ifdef FEAT_CLIENTSERVER | |
1011 | # ifdef WIN32 | |
1012 | --- 14100,14109 ---- | |
1013 | /* | |
1014 | * "remote_foreground()" function | |
1015 | */ | |
1016 | static void | |
1017 | f_remote_foreground(argvars, rettv) | |
1018 | ! typval_T *argvars UNUSED; | |
1019 | ! typval_T *rettv UNUSED; | |
1020 | { | |
1021 | #ifdef FEAT_CLIENTSERVER | |
1022 | # ifdef WIN32 | |
1023 | *************** | |
1024 | *** 14173,14182 **** | |
1025 | #endif | |
1026 | } | |
1027 | ||
1028 | - /*ARGSUSED*/ | |
1029 | static void | |
1030 | f_remote_peek(argvars, rettv) | |
1031 | ! typval_T *argvars; | |
1032 | typval_T *rettv; | |
1033 | { | |
1034 | #ifdef FEAT_CLIENTSERVER | |
1035 | --- 14125,14133 ---- | |
1036 | #endif | |
1037 | } | |
1038 | ||
1039 | static void | |
1040 | f_remote_peek(argvars, rettv) | |
1041 | ! typval_T *argvars UNUSED; | |
1042 | typval_T *rettv; | |
1043 | { | |
1044 | #ifdef FEAT_CLIENTSERVER | |
1045 | *************** | |
1046 | *** 14231,14240 **** | |
1047 | #endif | |
1048 | } | |
1049 | ||
1050 | - /*ARGSUSED*/ | |
1051 | static void | |
1052 | f_remote_read(argvars, rettv) | |
1053 | ! typval_T *argvars; | |
1054 | typval_T *rettv; | |
1055 | { | |
1056 | char_u *r = NULL; | |
1057 | --- 14182,14190 ---- | |
1058 | #endif | |
1059 | } | |
1060 | ||
1061 | static void | |
1062 | f_remote_read(argvars, rettv) | |
1063 | ! typval_T *argvars UNUSED; | |
1064 | typval_T *rettv; | |
1065 | { | |
1066 | char_u *r = NULL; | |
1067 | *************** | |
1068 | *** 14266,14275 **** | |
1069 | /* | |
1070 | * "remote_send()" function | |
1071 | */ | |
1072 | - /*ARGSUSED*/ | |
1073 | static void | |
1074 | f_remote_send(argvars, rettv) | |
1075 | ! typval_T *argvars; | |
1076 | typval_T *rettv; | |
1077 | { | |
1078 | rettv->v_type = VAR_STRING; | |
1079 | --- 14216,14224 ---- | |
1080 | /* | |
1081 | * "remote_send()" function | |
1082 | */ | |
1083 | static void | |
1084 | f_remote_send(argvars, rettv) | |
1085 | ! typval_T *argvars UNUSED; | |
1086 | typval_T *rettv; | |
1087 | { | |
1088 | rettv->v_type = VAR_STRING; | |
1089 | *************** | |
1090 | *** 14398,14404 **** | |
1091 | /* | |
1092 | * "repeat()" function | |
1093 | */ | |
1094 | - /*ARGSUSED*/ | |
1095 | static void | |
1096 | f_repeat(argvars, rettv) | |
1097 | typval_T *argvars; | |
1098 | --- 14347,14352 ---- | |
1099 | *************** | |
1100 | *** 15207,15216 **** | |
1101 | } | |
1102 | ||
1103 | ||
1104 | - /*ARGSUSED*/ | |
1105 | static void | |
1106 | f_server2client(argvars, rettv) | |
1107 | ! typval_T *argvars; | |
1108 | typval_T *rettv; | |
1109 | { | |
1110 | #ifdef FEAT_CLIENTSERVER | |
1111 | --- 15155,15163 ---- | |
1112 | } | |
1113 | ||
1114 | ||
1115 | static void | |
1116 | f_server2client(argvars, rettv) | |
1117 | ! typval_T *argvars UNUSED; | |
1118 | typval_T *rettv; | |
1119 | { | |
1120 | #ifdef FEAT_CLIENTSERVER | |
1121 | *************** | |
1122 | *** 15239,15248 **** | |
1123 | #endif | |
1124 | } | |
1125 | ||
1126 | - /*ARGSUSED*/ | |
1127 | static void | |
1128 | f_serverlist(argvars, rettv) | |
1129 | ! typval_T *argvars; | |
1130 | typval_T *rettv; | |
1131 | { | |
1132 | char_u *r = NULL; | |
1133 | --- 15186,15194 ---- | |
1134 | #endif | |
1135 | } | |
1136 | ||
1137 | static void | |
1138 | f_serverlist(argvars, rettv) | |
1139 | ! typval_T *argvars UNUSED; | |
1140 | typval_T *rettv; | |
1141 | { | |
1142 | char_u *r = NULL; | |
1143 | *************** | |
1144 | *** 15263,15273 **** | |
1145 | /* | |
1146 | * "setbufvar()" function | |
1147 | */ | |
1148 | - /*ARGSUSED*/ | |
1149 | static void | |
1150 | f_setbufvar(argvars, rettv) | |
1151 | typval_T *argvars; | |
1152 | ! typval_T *rettv; | |
1153 | { | |
1154 | buf_T *buf; | |
1155 | aco_save_T aco; | |
1156 | --- 15209,15218 ---- | |
1157 | /* | |
1158 | * "setbufvar()" function | |
1159 | */ | |
1160 | static void | |
1161 | f_setbufvar(argvars, rettv) | |
1162 | typval_T *argvars; | |
1163 | ! typval_T *rettv UNUSED; | |
1164 | { | |
1165 | buf_T *buf; | |
1166 | aco_save_T aco; | |
1167 | *************** | |
1168 | *** 15402,15413 **** | |
1169 | /* | |
1170 | * Used by "setqflist()" and "setloclist()" functions | |
1171 | */ | |
1172 | - /*ARGSUSED*/ | |
1173 | static void | |
1174 | set_qf_ll_list(wp, list_arg, action_arg, rettv) | |
1175 | ! win_T *wp; | |
1176 | ! typval_T *list_arg; | |
1177 | ! typval_T *action_arg; | |
1178 | typval_T *rettv; | |
1179 | { | |
1180 | #ifdef FEAT_QUICKFIX | |
1181 | --- 15347,15357 ---- | |
1182 | /* | |
1183 | * Used by "setqflist()" and "setloclist()" functions | |
1184 | */ | |
1185 | static void | |
1186 | set_qf_ll_list(wp, list_arg, action_arg, rettv) | |
1187 | ! win_T *wp UNUSED; | |
1188 | ! typval_T *list_arg UNUSED; | |
1189 | ! typval_T *action_arg UNUSED; | |
1190 | typval_T *rettv; | |
1191 | { | |
1192 | #ifdef FEAT_QUICKFIX | |
1193 | *************** | |
1194 | *** 15442,15448 **** | |
1195 | /* | |
1196 | * "setloclist()" function | |
1197 | */ | |
1198 | - /*ARGSUSED*/ | |
1199 | static void | |
1200 | f_setloclist(argvars, rettv) | |
1201 | typval_T *argvars; | |
1202 | --- 15386,15391 ---- | |
1203 | *************** | |
1204 | *** 15520,15526 **** | |
1205 | /* | |
1206 | * "setpos()" function | |
1207 | */ | |
1208 | - /*ARGSUSED*/ | |
1209 | static void | |
1210 | f_setpos(argvars, rettv) | |
1211 | typval_T *argvars; | |
1212 | --- 15463,15468 ---- | |
1213 | *************** | |
1214 | *** 15564,15570 **** | |
1215 | /* | |
1216 | * "setqflist()" function | |
1217 | */ | |
1218 | - /*ARGSUSED*/ | |
1219 | static void | |
1220 | f_setqflist(argvars, rettv) | |
1221 | typval_T *argvars; | |
1222 | --- 15506,15511 ---- | |
1223 | *************** | |
1224 | *** 15667,15677 **** | |
1225 | /* | |
1226 | * "setwinvar()" and "settabwinvar()" functions | |
1227 | */ | |
1228 | - /*ARGSUSED*/ | |
1229 | static void | |
1230 | setwinvar(argvars, rettv, off) | |
1231 | typval_T *argvars; | |
1232 | ! typval_T *rettv; | |
1233 | int off; | |
1234 | { | |
1235 | win_T *win; | |
1236 | --- 15608,15617 ---- | |
1237 | /* | |
1238 | * "setwinvar()" and "settabwinvar()" functions | |
1239 | */ | |
1240 | static void | |
1241 | setwinvar(argvars, rettv, off) | |
1242 | typval_T *argvars; | |
1243 | ! typval_T *rettv UNUSED; | |
1244 | int off; | |
1245 | { | |
1246 | win_T *win; | |
1247 | *************** | |
1248 | *** 15987,15996 **** | |
1249 | /* | |
1250 | * "spellbadword()" function | |
1251 | */ | |
1252 | - /* ARGSUSED */ | |
1253 | static void | |
1254 | f_spellbadword(argvars, rettv) | |
1255 | ! typval_T *argvars; | |
1256 | typval_T *rettv; | |
1257 | { | |
1258 | char_u *word = (char_u *)""; | |
1259 | --- 15927,15935 ---- | |
1260 | /* | |
1261 | * "spellbadword()" function | |
1262 | */ | |
1263 | static void | |
1264 | f_spellbadword(argvars, rettv) | |
1265 | ! typval_T *argvars UNUSED; | |
1266 | typval_T *rettv; | |
1267 | { | |
1268 | char_u *word = (char_u *)""; | |
1269 | *************** | |
1270 | *** 16042,16051 **** | |
1271 | /* | |
1272 | * "spellsuggest()" function | |
1273 | */ | |
1274 | - /*ARGSUSED*/ | |
1275 | static void | |
1276 | f_spellsuggest(argvars, rettv) | |
1277 | ! typval_T *argvars; | |
1278 | typval_T *rettv; | |
1279 | { | |
1280 | #ifdef FEAT_SPELL | |
1281 | --- 15981,15989 ---- | |
1282 | /* | |
1283 | * "spellsuggest()" function | |
1284 | */ | |
1285 | static void | |
1286 | f_spellsuggest(argvars, rettv) | |
1287 | ! typval_T *argvars UNUSED; | |
1288 | typval_T *rettv; | |
1289 | { | |
1290 | #ifdef FEAT_SPELL | |
1291 | *************** | |
1292 | *** 16528,16537 **** | |
1293 | /* | |
1294 | * "synID(lnum, col, trans)" function | |
1295 | */ | |
1296 | - /*ARGSUSED*/ | |
1297 | static void | |
1298 | f_synID(argvars, rettv) | |
1299 | ! typval_T *argvars; | |
1300 | typval_T *rettv; | |
1301 | { | |
1302 | int id = 0; | |
1303 | --- 16466,16474 ---- | |
1304 | /* | |
1305 | * "synID(lnum, col, trans)" function | |
1306 | */ | |
1307 | static void | |
1308 | f_synID(argvars, rettv) | |
1309 | ! typval_T *argvars UNUSED; | |
1310 | typval_T *rettv; | |
1311 | { | |
1312 | int id = 0; | |
1313 | *************** | |
1314 | *** 16556,16565 **** | |
1315 | /* | |
1316 | * "synIDattr(id, what [, mode])" function | |
1317 | */ | |
1318 | - /*ARGSUSED*/ | |
1319 | static void | |
1320 | f_synIDattr(argvars, rettv) | |
1321 | ! typval_T *argvars; | |
1322 | typval_T *rettv; | |
1323 | { | |
1324 | char_u *p = NULL; | |
1325 | --- 16493,16501 ---- | |
1326 | /* | |
1327 | * "synIDattr(id, what [, mode])" function | |
1328 | */ | |
1329 | static void | |
1330 | f_synIDattr(argvars, rettv) | |
1331 | ! typval_T *argvars UNUSED; | |
1332 | typval_T *rettv; | |
1333 | { | |
1334 | char_u *p = NULL; | |
1335 | *************** | |
1336 | *** 16652,16661 **** | |
1337 | /* | |
1338 | * "synIDtrans(id)" function | |
1339 | */ | |
1340 | - /*ARGSUSED*/ | |
1341 | static void | |
1342 | f_synIDtrans(argvars, rettv) | |
1343 | ! typval_T *argvars; | |
1344 | typval_T *rettv; | |
1345 | { | |
1346 | int id; | |
1347 | --- 16588,16596 ---- | |
1348 | /* | |
1349 | * "synIDtrans(id)" function | |
1350 | */ | |
1351 | static void | |
1352 | f_synIDtrans(argvars, rettv) | |
1353 | ! typval_T *argvars UNUSED; | |
1354 | typval_T *rettv; | |
1355 | { | |
1356 | int id; | |
1357 | *************** | |
1358 | *** 16675,16684 **** | |
1359 | /* | |
1360 | * "synstack(lnum, col)" function | |
1361 | */ | |
1362 | - /*ARGSUSED*/ | |
1363 | static void | |
1364 | f_synstack(argvars, rettv) | |
1365 | ! typval_T *argvars; | |
1366 | typval_T *rettv; | |
1367 | { | |
1368 | #ifdef FEAT_SYN_HL | |
1369 | --- 16610,16618 ---- | |
1370 | /* | |
1371 | * "synstack(lnum, col)" function | |
1372 | */ | |
1373 | static void | |
1374 | f_synstack(argvars, rettv) | |
1375 | ! typval_T *argvars UNUSED; | |
1376 | typval_T *rettv; | |
1377 | { | |
1378 | #ifdef FEAT_SYN_HL | |
1379 | *************** | |
1380 | *** 16812,16822 **** | |
1381 | /* | |
1382 | * "tabpagebuflist()" function | |
1383 | */ | |
1384 | - /* ARGSUSED */ | |
1385 | static void | |
1386 | f_tabpagebuflist(argvars, rettv) | |
1387 | ! typval_T *argvars; | |
1388 | ! typval_T *rettv; | |
1389 | { | |
1390 | #ifdef FEAT_WINDOWS | |
1391 | tabpage_T *tp; | |
1392 | --- 16746,16755 ---- | |
1393 | /* | |
1394 | * "tabpagebuflist()" function | |
1395 | */ | |
1396 | static void | |
1397 | f_tabpagebuflist(argvars, rettv) | |
1398 | ! typval_T *argvars UNUSED; | |
1399 | ! typval_T *rettv UNUSED; | |
1400 | { | |
1401 | #ifdef FEAT_WINDOWS | |
1402 | tabpage_T *tp; | |
1403 | *************** | |
1404 | *** 16844,16853 **** | |
1405 | /* | |
1406 | * "tabpagenr()" function | |
1407 | */ | |
1408 | - /* ARGSUSED */ | |
1409 | static void | |
1410 | f_tabpagenr(argvars, rettv) | |
1411 | ! typval_T *argvars; | |
1412 | typval_T *rettv; | |
1413 | { | |
1414 | int nr = 1; | |
1415 | --- 16777,16785 ---- | |
1416 | /* | |
1417 | * "tabpagenr()" function | |
1418 | */ | |
1419 | static void | |
1420 | f_tabpagenr(argvars, rettv) | |
1421 | ! typval_T *argvars UNUSED; | |
1422 | typval_T *rettv; | |
1423 | { | |
1424 | int nr = 1; | |
1425 | *************** | |
1426 | *** 16929,16938 **** | |
1427 | /* | |
1428 | * "tabpagewinnr()" function | |
1429 | */ | |
1430 | - /* ARGSUSED */ | |
1431 | static void | |
1432 | f_tabpagewinnr(argvars, rettv) | |
1433 | ! typval_T *argvars; | |
1434 | typval_T *rettv; | |
1435 | { | |
1436 | int nr = 1; | |
1437 | --- 16861,16869 ---- | |
1438 | /* | |
1439 | * "tabpagewinnr()" function | |
1440 | */ | |
1441 | static void | |
1442 | f_tabpagewinnr(argvars, rettv) | |
1443 | ! typval_T *argvars UNUSED; | |
1444 | typval_T *rettv; | |
1445 | { | |
1446 | int nr = 1; | |
1447 | *************** | |
1448 | *** 16952,16961 **** | |
1449 | /* | |
1450 | * "tagfiles()" function | |
1451 | */ | |
1452 | - /*ARGSUSED*/ | |
1453 | static void | |
1454 | f_tagfiles(argvars, rettv) | |
1455 | ! typval_T *argvars; | |
1456 | typval_T *rettv; | |
1457 | { | |
1458 | char_u fname[MAXPATHL + 1]; | |
1459 | --- 16883,16891 ---- | |
1460 | /* | |
1461 | * "tagfiles()" function | |
1462 | */ | |
1463 | static void | |
1464 | f_tagfiles(argvars, rettv) | |
1465 | ! typval_T *argvars UNUSED; | |
1466 | typval_T *rettv; | |
1467 | { | |
1468 | char_u fname[MAXPATHL + 1]; | |
1469 | *************** | |
1470 | *** 16995,17004 **** | |
1471 | /* | |
1472 | * "tempname()" function | |
1473 | */ | |
1474 | - /*ARGSUSED*/ | |
1475 | static void | |
1476 | f_tempname(argvars, rettv) | |
1477 | ! typval_T *argvars; | |
1478 | typval_T *rettv; | |
1479 | { | |
1480 | static int x = 'A'; | |
1481 | --- 16925,16933 ---- | |
1482 | /* | |
1483 | * "tempname()" function | |
1484 | */ | |
1485 | static void | |
1486 | f_tempname(argvars, rettv) | |
1487 | ! typval_T *argvars UNUSED; | |
1488 | typval_T *rettv; | |
1489 | { | |
1490 | static int x = 'A'; | |
1491 | *************** | |
1492 | *** 17031,17041 **** | |
1493 | /* | |
1494 | * "test(list)" function: Just checking the walls... | |
1495 | */ | |
1496 | - /*ARGSUSED*/ | |
1497 | static void | |
1498 | f_test(argvars, rettv) | |
1499 | ! typval_T *argvars; | |
1500 | ! typval_T *rettv; | |
1501 | { | |
1502 | /* Used for unit testing. Change the code below to your liking. */ | |
1503 | #if 0 | |
1504 | --- 16960,16969 ---- | |
1505 | /* | |
1506 | * "test(list)" function: Just checking the walls... | |
1507 | */ | |
1508 | static void | |
1509 | f_test(argvars, rettv) | |
1510 | ! typval_T *argvars UNUSED; | |
1511 | ! typval_T *rettv UNUSED; | |
1512 | { | |
1513 | /* Used for unit testing. Change the code below to your liking. */ | |
1514 | #if 0 | |
1515 | *************** | |
1516 | *** 17320,17330 **** | |
1517 | /* | |
1518 | * "visualmode()" function | |
1519 | */ | |
1520 | - /*ARGSUSED*/ | |
1521 | static void | |
1522 | f_visualmode(argvars, rettv) | |
1523 | ! typval_T *argvars; | |
1524 | ! typval_T *rettv; | |
1525 | { | |
1526 | #ifdef FEAT_VISUAL | |
1527 | char_u str[2]; | |
1528 | --- 17248,17257 ---- | |
1529 | /* | |
1530 | * "visualmode()" function | |
1531 | */ | |
1532 | static void | |
1533 | f_visualmode(argvars, rettv) | |
1534 | ! typval_T *argvars UNUSED; | |
1535 | ! typval_T *rettv UNUSED; | |
1536 | { | |
1537 | #ifdef FEAT_VISUAL | |
1538 | char_u str[2]; | |
1539 | *************** | |
1540 | *** 17360,17369 **** | |
1541 | /* | |
1542 | * "wincol()" function | |
1543 | */ | |
1544 | - /*ARGSUSED*/ | |
1545 | static void | |
1546 | f_wincol(argvars, rettv) | |
1547 | ! typval_T *argvars; | |
1548 | typval_T *rettv; | |
1549 | { | |
1550 | validate_cursor(); | |
1551 | --- 17287,17295 ---- | |
1552 | /* | |
1553 | * "wincol()" function | |
1554 | */ | |
1555 | static void | |
1556 | f_wincol(argvars, rettv) | |
1557 | ! typval_T *argvars UNUSED; | |
1558 | typval_T *rettv; | |
1559 | { | |
1560 | validate_cursor(); | |
1561 | *************** | |
1562 | *** 17390,17399 **** | |
1563 | /* | |
1564 | * "winline()" function | |
1565 | */ | |
1566 | - /*ARGSUSED*/ | |
1567 | static void | |
1568 | f_winline(argvars, rettv) | |
1569 | ! typval_T *argvars; | |
1570 | typval_T *rettv; | |
1571 | { | |
1572 | validate_cursor(); | |
1573 | --- 17316,17324 ---- | |
1574 | /* | |
1575 | * "winline()" function | |
1576 | */ | |
1577 | static void | |
1578 | f_winline(argvars, rettv) | |
1579 | ! typval_T *argvars UNUSED; | |
1580 | typval_T *rettv; | |
1581 | { | |
1582 | validate_cursor(); | |
1583 | *************** | |
1584 | *** 17403,17412 **** | |
1585 | /* | |
1586 | * "winnr()" function | |
1587 | */ | |
1588 | - /* ARGSUSED */ | |
1589 | static void | |
1590 | f_winnr(argvars, rettv) | |
1591 | ! typval_T *argvars; | |
1592 | typval_T *rettv; | |
1593 | { | |
1594 | int nr = 1; | |
1595 | --- 17328,17336 ---- | |
1596 | /* | |
1597 | * "winnr()" function | |
1598 | */ | |
1599 | static void | |
1600 | f_winnr(argvars, rettv) | |
1601 | ! typval_T *argvars UNUSED; | |
1602 | typval_T *rettv; | |
1603 | { | |
1604 | int nr = 1; | |
1605 | *************** | |
1606 | *** 17420,17429 **** | |
1607 | /* | |
1608 | * "winrestcmd()" function | |
1609 | */ | |
1610 | - /* ARGSUSED */ | |
1611 | static void | |
1612 | f_winrestcmd(argvars, rettv) | |
1613 | ! typval_T *argvars; | |
1614 | typval_T *rettv; | |
1615 | { | |
1616 | #ifdef FEAT_WINDOWS | |
1617 | --- 17344,17352 ---- | |
1618 | /* | |
1619 | * "winrestcmd()" function | |
1620 | */ | |
1621 | static void | |
1622 | f_winrestcmd(argvars, rettv) | |
1623 | ! typval_T *argvars UNUSED; | |
1624 | typval_T *rettv; | |
1625 | { | |
1626 | #ifdef FEAT_WINDOWS | |
1627 | *************** | |
1628 | *** 17455,17465 **** | |
1629 | /* | |
1630 | * "winrestview()" function | |
1631 | */ | |
1632 | - /* ARGSUSED */ | |
1633 | static void | |
1634 | f_winrestview(argvars, rettv) | |
1635 | typval_T *argvars; | |
1636 | ! typval_T *rettv; | |
1637 | { | |
1638 | dict_T *dict; | |
1639 | ||
1640 | --- 17378,17387 ---- | |
1641 | /* | |
1642 | * "winrestview()" function | |
1643 | */ | |
1644 | static void | |
1645 | f_winrestview(argvars, rettv) | |
1646 | typval_T *argvars; | |
1647 | ! typval_T *rettv UNUSED; | |
1648 | { | |
1649 | dict_T *dict; | |
1650 | ||
1651 | *************** | |
1652 | *** 17501,17510 **** | |
1653 | /* | |
1654 | * "winsaveview()" function | |
1655 | */ | |
1656 | - /* ARGSUSED */ | |
1657 | static void | |
1658 | f_winsaveview(argvars, rettv) | |
1659 | ! typval_T *argvars; | |
1660 | typval_T *rettv; | |
1661 | { | |
1662 | dict_T *dict; | |
1663 | --- 17423,17431 ---- | |
1664 | /* | |
1665 | * "winsaveview()" function | |
1666 | */ | |
1667 | static void | |
1668 | f_winsaveview(argvars, rettv) | |
1669 | ! typval_T *argvars UNUSED; | |
1670 | typval_T *rettv; | |
1671 | { | |
1672 | dict_T *dict; | |
1673 | *************** | |
1674 | *** 21646,21657 **** | |
1675 | * Called by do_cmdline() to get the next line. | |
1676 | * Returns allocated string, or NULL for end of function. | |
1677 | */ | |
1678 | - /* ARGSUSED */ | |
1679 | char_u * | |
1680 | get_func_line(c, cookie, indent) | |
1681 | ! int c; /* not used */ | |
1682 | void *cookie; | |
1683 | ! int indent; /* not used */ | |
1684 | { | |
1685 | funccall_T *fcp = (funccall_T *)cookie; | |
1686 | ufunc_T *fp = fcp->func; | |
1687 | --- 21567,21577 ---- | |
1688 | * Called by do_cmdline() to get the next line. | |
1689 | * Returns allocated string, or NULL for end of function. | |
1690 | */ | |
1691 | char_u * | |
1692 | get_func_line(c, cookie, indent) | |
1693 | ! int c UNUSED; | |
1694 | void *cookie; | |
1695 | ! int indent UNUSED; | |
1696 | { | |
1697 | funccall_T *fcp = (funccall_T *)cookie; | |
1698 | ufunc_T *fp = fcp->func; | |
1699 | *************** | |
1700 | *** 22023,22032 **** | |
1701 | /* | |
1702 | * List v:oldfiles in a nice way. | |
1703 | */ | |
1704 | - /*ARGSUSED*/ | |
1705 | void | |
1706 | ex_oldfiles(eap) | |
1707 | ! exarg_T *eap; | |
1708 | { | |
1709 | list_T *l = vimvars[VV_OLDFILES].vv_list; | |
1710 | listitem_T *li; | |
1711 | --- 21943,21951 ---- | |
1712 | /* | |
1713 | * List v:oldfiles in a nice way. | |
1714 | */ | |
1715 | void | |
1716 | ex_oldfiles(eap) | |
1717 | ! exarg_T *eap UNUSED; | |
1718 | { | |
1719 | list_T *l = vimvars[VV_OLDFILES].vv_list; | |
1720 | listitem_T *li; | |
1721 | *** ../vim-7.2.176/src/ex_docmd.c 2009-05-16 16:36:25.000000000 +0200 | |
1722 | --- src/ex_docmd.c 2009-05-16 17:01:26.000000000 +0200 | |
1723 | *************** | |
1724 | *** 3004,3010 **** | |
1725 | ||
1726 | if (VIM_ISDIGIT(*cmd)) | |
1727 | p = skipwhite(skipdigits(cmd)); | |
1728 | ! for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) | |
1729 | { | |
1730 | for (j = 0; p[j] != NUL; ++j) | |
1731 | if (p[j] != cmdmods[i].name[j]) | |
1732 | --- 3004,3010 ---- | |
1733 | ||
1734 | if (VIM_ISDIGIT(*cmd)) | |
1735 | p = skipwhite(skipdigits(cmd)); | |
1736 | ! for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) | |
1737 | { | |
1738 | for (j = 0; p[j] != NUL; ++j) | |
1739 | if (p[j] != cmdmods[i].name[j]) | |
1740 | *************** | |
1741 | *** 3032,3038 **** | |
1742 | char_u *p; | |
1743 | ||
1744 | /* Check command modifiers. */ | |
1745 | ! for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) | |
1746 | { | |
1747 | for (j = 0; name[j] != NUL; ++j) | |
1748 | if (name[j] != cmdmods[i].name[j]) | |
1749 | --- 3032,3038 ---- | |
1750 | char_u *p; | |
1751 | ||
1752 | /* Check command modifiers. */ | |
1753 | ! for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) | |
1754 | { | |
1755 | for (j = 0; name[j] != NUL; ++j) | |
1756 | if (name[j] != cmdmods[i].name[j]) | |
1757 | *************** | |
1758 | *** 6093,6099 **** | |
1759 | {"bang", "bar", "buffer", "complete", "count", | |
1760 | "nargs", "range", "register"}; | |
1761 | ||
1762 | ! if (idx >= sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0])) | |
1763 | return NULL; | |
1764 | return (char_u *)user_cmd_flags[idx]; | |
1765 | } | |
1766 | --- 6093,6099 ---- | |
1767 | {"bang", "bar", "buffer", "complete", "count", | |
1768 | "nargs", "range", "register"}; | |
1769 | ||
1770 | ! if (idx >= (int)(sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0]))) | |
1771 | return NULL; | |
1772 | return (char_u *)user_cmd_flags[idx]; | |
1773 | } | |
1774 | *************** | |
1775 | *** 6108,6114 **** | |
1776 | { | |
1777 | static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; | |
1778 | ||
1779 | ! if (idx >= sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0])) | |
1780 | return NULL; | |
1781 | return (char_u *)user_cmd_nargs[idx]; | |
1782 | } | |
1783 | --- 6108,6114 ---- | |
1784 | { | |
1785 | static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; | |
1786 | ||
1787 | ! if (idx >= (int)(sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0]))) | |
1788 | return NULL; | |
1789 | return (char_u *)user_cmd_nargs[idx]; | |
1790 | } | |
1791 | *************** | |
1792 | *** 9144,9153 **** | |
1793 | /* | |
1794 | * ":stopinsert" | |
1795 | */ | |
1796 | - /*ARGSUSED*/ | |
1797 | static void | |
1798 | ex_stopinsert(eap) | |
1799 | ! exarg_T *eap; | |
1800 | { | |
1801 | restart_edit = 0; | |
1802 | stop_insert_mode = TRUE; | |
1803 | --- 9144,9152 ---- | |
1804 | /* | |
1805 | * ":stopinsert" | |
1806 | */ | |
1807 | static void | |
1808 | ex_stopinsert(eap) | |
1809 | ! exarg_T *eap UNUSED; | |
1810 | { | |
1811 | restart_edit = 0; | |
1812 | stop_insert_mode = TRUE; | |
1813 | *** ../vim-7.2.176/src/ex_eval.c 2007-11-24 21:50:19.000000000 +0100 | |
1814 | --- src/ex_eval.c 2009-05-16 17:06:09.000000000 +0200 | |
1815 | *************** | |
1816 | *** 60,66 **** | |
1817 | --- 60,68 ---- | |
1818 | #else | |
1819 | /* Values used for the Vim release. */ | |
1820 | # define THROW_ON_ERROR TRUE | |
1821 | + # define THROW_ON_ERROR_TRUE | |
1822 | # define THROW_ON_INTERRUPT TRUE | |
1823 | + # define THROW_ON_INTERRUPT_TRUE | |
1824 | #endif | |
1825 | ||
1826 | static void catch_exception __ARGS((except_T *excp)); | |
1827 | *************** | |
1828 | *** 1320,1335 **** | |
1829 | --- 1322,1341 ---- | |
1830 | * and reset the did_emsg or got_int flag, so this won't happen again at | |
1831 | * the next surrounding try conditional. | |
1832 | */ | |
1833 | + #ifndef THROW_ON_ERROR_TRUE | |
1834 | if (did_emsg && !THROW_ON_ERROR) | |
1835 | { | |
1836 | inactivate_try = TRUE; | |
1837 | did_emsg = FALSE; | |
1838 | } | |
1839 | + #endif | |
1840 | + #ifndef THROW_ON_INTERRUPT_TRUE | |
1841 | if (got_int && !THROW_ON_INTERRUPT) | |
1842 | { | |
1843 | inactivate_try = TRUE; | |
1844 | got_int = FALSE; | |
1845 | } | |
1846 | + #endif | |
1847 | idx = cleanup_conditionals(cstack, 0, inactivate_try); | |
1848 | if (idx >= 0) | |
1849 | { | |
1850 | *************** | |
1851 | *** 2254,2263 **** | |
1852 | /* | |
1853 | * ":endfunction" when not after a ":function" | |
1854 | */ | |
1855 | - /*ARGSUSED*/ | |
1856 | void | |
1857 | ex_endfunction(eap) | |
1858 | ! exarg_T *eap; | |
1859 | { | |
1860 | EMSG(_("E193: :endfunction not inside a function")); | |
1861 | } | |
1862 | --- 2260,2268 ---- | |
1863 | /* | |
1864 | * ":endfunction" when not after a ":function" | |
1865 | */ | |
1866 | void | |
1867 | ex_endfunction(eap) | |
1868 | ! exarg_T *eap UNUSED; | |
1869 | { | |
1870 | EMSG(_("E193: :endfunction not inside a function")); | |
1871 | } | |
1872 | *** ../vim-7.2.176/src/ex_getln.c 2009-05-15 21:31:11.000000000 +0200 | |
1873 | --- src/ex_getln.c 2009-05-16 17:06:55.000000000 +0200 | |
1874 | *************** | |
1875 | *** 4533,4539 **** | |
1876 | * right function to do the expansion. | |
1877 | */ | |
1878 | ret = FAIL; | |
1879 | ! for (i = 0; i < sizeof(tab) / sizeof(struct expgen); ++i) | |
1880 | if (xp->xp_context == tab[i].context) | |
1881 | { | |
1882 | if (tab[i].ic) | |
1883 | --- 4533,4539 ---- | |
1884 | * right function to do the expansion. | |
1885 | */ | |
1886 | ret = FAIL; | |
1887 | ! for (i = 0; i < (int)(sizeof(tab) / sizeof(struct expgen)); ++i) | |
1888 | if (xp->xp_context == tab[i].context) | |
1889 | { | |
1890 | if (tab[i].ic) | |
1891 | *** ../vim-7.2.176/src/fileio.c 2009-05-15 21:31:11.000000000 +0200 | |
1892 | --- src/fileio.c 2009-05-16 17:07:35.000000000 +0200 | |
1893 | *************** | |
1894 | *** 9085,9096 **** | |
1895 | * Called by do_cmdline() to get the next line for ":if". | |
1896 | * Returns allocated string, or NULL for end of autocommands. | |
1897 | */ | |
1898 | - /* ARGSUSED */ | |
1899 | static char_u * | |
1900 | getnextac(c, cookie, indent) | |
1901 | ! int c; /* not used */ | |
1902 | void *cookie; | |
1903 | ! int indent; /* not used */ | |
1904 | { | |
1905 | AutoPatCmd *acp = (AutoPatCmd *)cookie; | |
1906 | char_u *retval; | |
1907 | --- 9093,9103 ---- | |
1908 | * Called by do_cmdline() to get the next line for ":if". | |
1909 | * Returns allocated string, or NULL for end of autocommands. | |
1910 | */ | |
1911 | static char_u * | |
1912 | getnextac(c, cookie, indent) | |
1913 | ! int c UNUSED; | |
1914 | void *cookie; | |
1915 | ! int indent UNUSED; | |
1916 | { | |
1917 | AutoPatCmd *acp = (AutoPatCmd *)cookie; | |
1918 | char_u *retval; | |
1919 | *************** | |
1920 | *** 9201,9210 **** | |
1921 | * Function given to ExpandGeneric() to obtain the list of autocommand group | |
1922 | * names. | |
1923 | */ | |
1924 | - /*ARGSUSED*/ | |
1925 | char_u * | |
1926 | get_augroup_name(xp, idx) | |
1927 | ! expand_T *xp; | |
1928 | int idx; | |
1929 | { | |
1930 | if (idx == augroups.ga_len) /* add "END" add the end */ | |
1931 | --- 9208,9216 ---- | |
1932 | * Function given to ExpandGeneric() to obtain the list of autocommand group | |
1933 | * names. | |
1934 | */ | |
1935 | char_u * | |
1936 | get_augroup_name(xp, idx) | |
1937 | ! expand_T *xp UNUSED; | |
1938 | int idx; | |
1939 | { | |
1940 | if (idx == augroups.ga_len) /* add "END" add the end */ | |
1941 | *************** | |
1942 | *** 9270,9279 **** | |
1943 | /* | |
1944 | * Function given to ExpandGeneric() to obtain the list of event names. | |
1945 | */ | |
1946 | - /*ARGSUSED*/ | |
1947 | char_u * | |
1948 | get_event_name(xp, idx) | |
1949 | ! expand_T *xp; | |
1950 | int idx; | |
1951 | { | |
1952 | if (idx < augroups.ga_len) /* First list group names, if wanted */ | |
1953 | --- 9276,9284 ---- | |
1954 | /* | |
1955 | * Function given to ExpandGeneric() to obtain the list of event names. | |
1956 | */ | |
1957 | char_u * | |
1958 | get_event_name(xp, idx) | |
1959 | ! expand_T *xp UNUSED; | |
1960 | int idx; | |
1961 | { | |
1962 | if (idx < augroups.ga_len) /* First list group names, if wanted */ | |
1963 | *** ../vim-7.2.176/src/hardcopy.c 2008-01-12 16:46:41.000000000 +0100 | |
1964 | --- src/hardcopy.c 2009-05-16 17:18:27.000000000 +0200 | |
1965 | *************** | |
1966 | *** 442,453 **** | |
1967 | /* | |
1968 | * Print the page header. | |
1969 | */ | |
1970 | - /*ARGSUSED*/ | |
1971 | static void | |
1972 | prt_header(psettings, pagenum, lnum) | |
1973 | prt_settings_T *psettings; | |
1974 | int pagenum; | |
1975 | ! linenr_T lnum; | |
1976 | { | |
1977 | int width = psettings->chars_per_line; | |
1978 | int page_line; | |
1979 | --- 442,452 ---- | |
1980 | /* | |
1981 | * Print the page header. | |
1982 | */ | |
1983 | static void | |
1984 | prt_header(psettings, pagenum, lnum) | |
1985 | prt_settings_T *psettings; | |
1986 | int pagenum; | |
1987 | ! linenr_T lnum UNUSED; | |
1988 | { | |
1989 | int width = psettings->chars_per_line; | |
1990 | int page_line; | |
1991 | *************** | |
1992 | *** 1881,1887 **** | |
1993 | return FALSE; | |
1994 | ||
1995 | /* Find type of DSC comment */ | |
1996 | ! for (comment = 0; comment < NUM_ELEMENTS(prt_dsc_table); comment++) | |
1997 | if (prt_resfile_strncmp(0, prt_dsc_table[comment].string, | |
1998 | prt_dsc_table[comment].len) == 0) | |
1999 | break; | |
2000 | --- 1880,1886 ---- | |
2001 | return FALSE; | |
2002 | ||
2003 | /* Find type of DSC comment */ | |
2004 | ! for (comment = 0; comment < (int)NUM_ELEMENTS(prt_dsc_table); comment++) | |
2005 | if (prt_resfile_strncmp(0, prt_dsc_table[comment].string, | |
2006 | prt_dsc_table[comment].len) == 0) | |
2007 | break; | |
2008 | *************** | |
2009 | *** 2454,2465 **** | |
2010 | } | |
2011 | #endif | |
2012 | ||
2013 | - /*ARGSUSED*/ | |
2014 | int | |
2015 | mch_print_init(psettings, jobname, forceit) | |
2016 | prt_settings_T *psettings; | |
2017 | char_u *jobname; | |
2018 | ! int forceit; | |
2019 | { | |
2020 | int i; | |
2021 | char *paper_name; | |
2022 | --- 2453,2463 ---- | |
2023 | } | |
2024 | #endif | |
2025 | ||
2026 | int | |
2027 | mch_print_init(psettings, jobname, forceit) | |
2028 | prt_settings_T *psettings; | |
2029 | char_u *jobname; | |
2030 | ! int forceit UNUSED; | |
2031 | { | |
2032 | int i; | |
2033 | char *paper_name; | |
2034 | *************** | |
2035 | *** 2514,2520 **** | |
2036 | if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) | |
2037 | { | |
2038 | p_mbenc_first = NULL; | |
2039 | ! for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++) | |
2040 | if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], | |
2041 | &p_mbenc)) | |
2042 | { | |
2043 | --- 2512,2518 ---- | |
2044 | if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) | |
2045 | { | |
2046 | p_mbenc_first = NULL; | |
2047 | ! for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++) | |
2048 | if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], | |
2049 | &p_mbenc)) | |
2050 | { | |
2051 | *************** | |
2052 | *** 2642,2648 **** | |
2053 | paper_name = "A4"; | |
2054 | paper_strlen = 2; | |
2055 | } | |
2056 | ! for (i = 0; i < PRT_MEDIASIZE_LEN; ++i) | |
2057 | if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen | |
2058 | && STRNICMP(prt_mediasize[i].name, paper_name, | |
2059 | paper_strlen) == 0) | |
2060 | --- 2640,2646 ---- | |
2061 | paper_name = "A4"; | |
2062 | paper_strlen = 2; | |
2063 | } | |
2064 | ! for (i = 0; i < (int)PRT_MEDIASIZE_LEN; ++i) | |
2065 | if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen | |
2066 | && STRNICMP(prt_mediasize[i].name, paper_name, | |
2067 | paper_strlen) == 0) | |
2068 | *************** | |
2069 | *** 3308,3317 **** | |
2070 | return !prt_file_error; | |
2071 | } | |
2072 | ||
2073 | - /*ARGSUSED*/ | |
2074 | int | |
2075 | mch_print_begin_page(str) | |
2076 | ! char_u *str; | |
2077 | { | |
2078 | int page_num[2]; | |
2079 | ||
2080 | --- 3306,3314 ---- | |
2081 | return !prt_file_error; | |
2082 | } | |
2083 | ||
2084 | int | |
2085 | mch_print_begin_page(str) | |
2086 | ! char_u *str UNUSED; | |
2087 | { | |
2088 | int page_num[2]; | |
2089 | ||
2090 | *************** | |
2091 | *** 3379,3389 **** | |
2092 | #endif | |
2093 | } | |
2094 | ||
2095 | - /*ARGSUSED*/ | |
2096 | int | |
2097 | mch_print_text_out(p, len) | |
2098 | char_u *p; | |
2099 | ! int len; | |
2100 | { | |
2101 | int need_break; | |
2102 | char_u ch; | |
2103 | --- 3376,3385 ---- | |
2104 | #endif | |
2105 | } | |
2106 | ||
2107 | int | |
2108 | mch_print_text_out(p, len) | |
2109 | char_u *p; | |
2110 | ! int len UNUSED; | |
2111 | { | |
2112 | int need_break; | |
2113 | char_u ch; | |
2114 | *** ../vim-7.2.176/src/if_cscope.c 2009-05-16 16:15:39.000000000 +0200 | |
2115 | --- src/if_cscope.c 2009-05-16 17:19:30.000000000 +0200 | |
2116 | *************** | |
2117 | *** 83,89 **** | |
2118 | N_("Reinit all connections"), "reset", 0 }, | |
2119 | { "show", cs_show, | |
2120 | N_("Show connections"), "show", 0 }, | |
2121 | ! { NULL } | |
2122 | }; | |
2123 | ||
2124 | static void | |
2125 | --- 83,89 ---- | |
2126 | N_("Reinit all connections"), "reset", 0 }, | |
2127 | { "show", cs_show, | |
2128 | N_("Show connections"), "show", 0 }, | |
2129 | ! { NULL, NULL, NULL, NULL, 0 } | |
2130 | }; | |
2131 | ||
2132 | static void | |
2133 | *************** | |
2134 | *** 107,116 **** | |
2135 | * Function given to ExpandGeneric() to obtain the cscope command | |
2136 | * expansion. | |
2137 | */ | |
2138 | - /*ARGSUSED*/ | |
2139 | char_u * | |
2140 | get_cscope_name(xp, idx) | |
2141 | ! expand_T *xp; | |
2142 | int idx; | |
2143 | { | |
2144 | int current_idx; | |
2145 | --- 107,115 ---- | |
2146 | * Function given to ExpandGeneric() to obtain the cscope command | |
2147 | * expansion. | |
2148 | */ | |
2149 | char_u * | |
2150 | get_cscope_name(xp, idx) | |
2151 | ! expand_T *xp UNUSED; | |
2152 | int idx; | |
2153 | { | |
2154 | int current_idx; | |
2155 | *************** | |
2156 | *** 496,505 **** | |
2157 | * | |
2158 | * MAXPATHL 256 | |
2159 | */ | |
2160 | - /* ARGSUSED */ | |
2161 | static int | |
2162 | cs_add(eap) | |
2163 | ! exarg_T *eap; | |
2164 | { | |
2165 | char *fname, *ppath, *flags = NULL; | |
2166 | ||
2167 | --- 495,503 ---- | |
2168 | * | |
2169 | * MAXPATHL 256 | |
2170 | */ | |
2171 | static int | |
2172 | cs_add(eap) | |
2173 | ! exarg_T *eap UNUSED; | |
2174 | { | |
2175 | char *fname, *ppath, *flags = NULL; | |
2176 | ||
2177 | *************** | |
2178 | *** 1292,1301 **** | |
2179 | * | |
2180 | * print help | |
2181 | */ | |
2182 | - /* ARGSUSED */ | |
2183 | static int | |
2184 | cs_help(eap) | |
2185 | ! exarg_T *eap; | |
2186 | { | |
2187 | cscmd_T *cmdp = cs_cmds; | |
2188 | ||
2189 | --- 1290,1298 ---- | |
2190 | * | |
2191 | * print help | |
2192 | */ | |
2193 | static int | |
2194 | cs_help(eap) | |
2195 | ! exarg_T *eap UNUSED; | |
2196 | { | |
2197 | cscmd_T *cmdp = cs_cmds; | |
2198 | ||
2199 | *************** | |
2200 | *** 1399,1411 **** | |
2201 | * | |
2202 | * insert a new cscope database filename into the filelist | |
2203 | */ | |
2204 | - /*ARGSUSED*/ | |
2205 | static int | |
2206 | cs_insert_filelist(fname, ppath, flags, sb) | |
2207 | char *fname; | |
2208 | char *ppath; | |
2209 | char *flags; | |
2210 | ! struct stat *sb; | |
2211 | { | |
2212 | short i, j; | |
2213 | #ifndef UNIX | |
2214 | --- 1396,1407 ---- | |
2215 | * | |
2216 | * insert a new cscope database filename into the filelist | |
2217 | */ | |
2218 | static int | |
2219 | cs_insert_filelist(fname, ppath, flags, sb) | |
2220 | char *fname; | |
2221 | char *ppath; | |
2222 | char *flags; | |
2223 | ! struct stat *sb UNUSED; | |
2224 | { | |
2225 | short i, j; | |
2226 | #ifndef UNIX | |
2227 | *************** | |
2228 | *** 1561,1570 **** | |
2229 | * | |
2230 | * nuke em | |
2231 | */ | |
2232 | - /* ARGSUSED */ | |
2233 | static int | |
2234 | cs_kill(eap) | |
2235 | ! exarg_T *eap; | |
2236 | { | |
2237 | char *stok; | |
2238 | short i; | |
2239 | --- 1557,1565 ---- | |
2240 | * | |
2241 | * nuke em | |
2242 | */ | |
2243 | static int | |
2244 | cs_kill(eap) | |
2245 | ! exarg_T *eap UNUSED; | |
2246 | { | |
2247 | char *stok; | |
2248 | short i; | |
2249 | *************** | |
2250 | *** 2241,2247 **** | |
2251 | /* | |
2252 | * Used to catch and ignore SIGALRM below. | |
2253 | */ | |
2254 | - /* ARGSUSED */ | |
2255 | static RETSIGTYPE | |
2256 | sig_handler SIGDEFARG(sigarg) | |
2257 | { | |
2258 | --- 2236,2241 ---- | |
2259 | *************** | |
2260 | *** 2381,2390 **** | |
2261 | * | |
2262 | * calls cs_kill on all cscope connections then reinits | |
2263 | */ | |
2264 | - /* ARGSUSED */ | |
2265 | static int | |
2266 | cs_reset(eap) | |
2267 | ! exarg_T *eap; | |
2268 | { | |
2269 | char **dblist = NULL, **pplist = NULL, **fllist = NULL; | |
2270 | int i; | |
2271 | --- 2375,2383 ---- | |
2272 | * | |
2273 | * calls cs_kill on all cscope connections then reinits | |
2274 | */ | |
2275 | static int | |
2276 | cs_reset(eap) | |
2277 | ! exarg_T *eap UNUSED; | |
2278 | { | |
2279 | char **dblist = NULL, **pplist = NULL, **fllist = NULL; | |
2280 | int i; | |
2281 | *************** | |
2282 | *** 2497,2506 **** | |
2283 | * | |
2284 | * show all cscope connections | |
2285 | */ | |
2286 | - /* ARGSUSED */ | |
2287 | static int | |
2288 | cs_show(eap) | |
2289 | ! exarg_T *eap; | |
2290 | { | |
2291 | short i; | |
2292 | if (cs_cnt_connections() == 0) | |
2293 | --- 2490,2498 ---- | |
2294 | * | |
2295 | * show all cscope connections | |
2296 | */ | |
2297 | static int | |
2298 | cs_show(eap) | |
2299 | ! exarg_T *eap UNUSED; | |
2300 | { | |
2301 | short i; | |
2302 | if (cs_cnt_connections() == 0) | |
2303 | *** ../vim-7.2.176/src/if_xcmdsrv.c 2008-11-12 14:52:11.000000000 +0100 | |
2304 | --- src/if_xcmdsrv.c 2009-05-16 17:12:32.000000000 +0200 | |
2305 | *************** | |
2306 | *** 682,688 **** | |
2307 | * Scan all of the names out of the property. | |
2308 | */ | |
2309 | ga_init2(&ga, 1, 100); | |
2310 | ! for (p = regProp; (p - regProp) < numItems; p++) | |
2311 | { | |
2312 | entry = p; | |
2313 | while (*p != 0 && !isspace(*p)) | |
2314 | --- 682,688 ---- | |
2315 | * Scan all of the names out of the property. | |
2316 | */ | |
2317 | ga_init2(&ga, 1, 100); | |
2318 | ! for (p = regProp; (long_u)(p - regProp) < numItems; p++) | |
2319 | { | |
2320 | entry = p; | |
2321 | while (*p != 0 && !isspace(*p)) | |
2322 | *************** | |
2323 | *** 969,975 **** | |
2324 | */ | |
2325 | returnValue = (int_u)None; | |
2326 | entry = NULL; /* Not needed, but eliminates compiler warning. */ | |
2327 | ! for (p = regProp; (p - regProp) < numItems; ) | |
2328 | { | |
2329 | entry = p; | |
2330 | while (*p != 0 && !isspace(*p)) | |
2331 | --- 969,975 ---- | |
2332 | */ | |
2333 | returnValue = (int_u)None; | |
2334 | entry = NULL; /* Not needed, but eliminates compiler warning. */ | |
2335 | ! for (p = regProp; (long_u)(p - regProp) < numItems; ) | |
2336 | { | |
2337 | entry = p; | |
2338 | while (*p != 0 && !isspace(*p)) | |
2339 | *************** | |
2340 | *** 986,992 **** | |
2341 | ||
2342 | if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name)) | |
2343 | { | |
2344 | ! for (p = regProp; (p - regProp) < numItems; ) | |
2345 | { | |
2346 | entry = p; | |
2347 | while (*p != 0 && !isspace(*p)) | |
2348 | --- 986,992 ---- | |
2349 | ||
2350 | if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name)) | |
2351 | { | |
2352 | ! for (p = regProp; (long_u)(p - regProp) < numItems; ) | |
2353 | { | |
2354 | entry = p; | |
2355 | while (*p != 0 && !isspace(*p)) | |
2356 | *************** | |
2357 | *** 1056,1062 **** | |
2358 | return; | |
2359 | ||
2360 | /* Scan the property for the window id. */ | |
2361 | ! for (p = regProp; (p - regProp) < numItems; ) | |
2362 | { | |
2363 | if (*p != 0) | |
2364 | { | |
2365 | --- 1056,1062 ---- | |
2366 | return; | |
2367 | ||
2368 | /* Scan the property for the window id. */ | |
2369 | ! for (p = regProp; (long_u)(p - regProp) < numItems; ) | |
2370 | { | |
2371 | if (*p != 0) | |
2372 | { | |
2373 | *************** | |
2374 | *** 1196,1202 **** | |
2375 | * one time; each iteration through the outer loop handles a | |
2376 | * single command or result. | |
2377 | */ | |
2378 | ! for (p = propInfo; (p - propInfo) < numItems; ) | |
2379 | { | |
2380 | /* | |
2381 | * Ignore leading NULs; each command or result starts with a | |
2382 | --- 1196,1202 ---- | |
2383 | * one time; each iteration through the outer loop handles a | |
2384 | * single command or result. | |
2385 | */ | |
2386 | ! for (p = propInfo; (long_u)(p - propInfo) < numItems; ) | |
2387 | { | |
2388 | /* | |
2389 | * Ignore leading NULs; each command or result starts with a | |
2390 | *************** | |
2391 | *** 1230,1236 **** | |
2392 | serial = (char_u *)""; | |
2393 | script = NULL; | |
2394 | enc = NULL; | |
2395 | ! while (p - propInfo < numItems && *p == '-') | |
2396 | { | |
2397 | switch (p[1]) | |
2398 | { | |
2399 | --- 1230,1236 ---- | |
2400 | serial = (char_u *)""; | |
2401 | script = NULL; | |
2402 | enc = NULL; | |
2403 | ! while ((long_u)(p - propInfo) < numItems && *p == '-') | |
2404 | { | |
2405 | switch (p[1]) | |
2406 | { | |
2407 | *************** | |
2408 | *** 1333,1339 **** | |
2409 | res = (char_u *)""; | |
2410 | code = 0; | |
2411 | enc = NULL; | |
2412 | ! while ((p-propInfo) < numItems && *p == '-') | |
2413 | { | |
2414 | switch (p[1]) | |
2415 | { | |
2416 | --- 1333,1339 ---- | |
2417 | res = (char_u *)""; | |
2418 | code = 0; | |
2419 | enc = NULL; | |
2420 | ! while ((long_u)(p - propInfo) < numItems && *p == '-') | |
2421 | { | |
2422 | switch (p[1]) | |
2423 | { | |
2424 | *************** | |
2425 | *** 1401,1407 **** | |
2426 | gotWindow = 0; | |
2427 | str = (char_u *)""; | |
2428 | enc = NULL; | |
2429 | ! while ((p-propInfo) < numItems && *p == '-') | |
2430 | { | |
2431 | switch (p[1]) | |
2432 | { | |
2433 | --- 1401,1407 ---- | |
2434 | gotWindow = 0; | |
2435 | str = (char_u *)""; | |
2436 | enc = NULL; | |
2437 | ! while ((long_u)(p - propInfo) < numItems && *p == '-') | |
2438 | { | |
2439 | switch (p[1]) | |
2440 | { | |
2441 | *************** | |
2442 | *** 1489,1499 **** | |
2443 | /* | |
2444 | * Another X Error handler, just used to check for errors. | |
2445 | */ | |
2446 | - /* ARGSUSED */ | |
2447 | static int | |
2448 | x_error_check(dpy, error_event) | |
2449 | ! Display *dpy; | |
2450 | ! XErrorEvent *error_event; | |
2451 | { | |
2452 | got_x_error = TRUE; | |
2453 | return 0; | |
2454 | --- 1489,1498 ---- | |
2455 | /* | |
2456 | * Another X Error handler, just used to check for errors. | |
2457 | */ | |
2458 | static int | |
2459 | x_error_check(dpy, error_event) | |
2460 | ! Display *dpy UNUSED; | |
2461 | ! XErrorEvent *error_event UNUSED; | |
2462 | { | |
2463 | got_x_error = TRUE; | |
2464 | return 0; | |
2465 | *** ../vim-7.2.176/src/farsi.c 2008-06-25 00:25:17.000000000 +0200 | |
2466 | --- src/farsi.c 2009-05-16 17:14:41.000000000 +0200 | |
2467 | *************** | |
2468 | *** 103,109 **** | |
2469 | case F_HE: | |
2470 | tempc = _HE; | |
2471 | ||
2472 | ! if (p_ri && (curwin->w_cursor.col+1 < STRLEN(ml_get_curline()))) | |
2473 | { | |
2474 | inc_cursor(); | |
2475 | ||
2476 | --- 103,110 ---- | |
2477 | case F_HE: | |
2478 | tempc = _HE; | |
2479 | ||
2480 | ! if (p_ri && (curwin->w_cursor.col + 1 | |
2481 | ! < (colnr_T)STRLEN(ml_get_curline()))) | |
2482 | { | |
2483 | inc_cursor(); | |
2484 | ||
2485 | *************** | |
2486 | *** 344,350 **** | |
2487 | if (curwin->w_p_rl && p_ri) | |
2488 | return; | |
2489 | ||
2490 | ! if ( (curwin->w_cursor.col < STRLEN(ml_get_curline()))) | |
2491 | { | |
2492 | if ((p_ri && curwin->w_cursor.col) || !p_ri) | |
2493 | { | |
2494 | --- 345,351 ---- | |
2495 | if (curwin->w_p_rl && p_ri) | |
2496 | return; | |
2497 | ||
2498 | ! if ((curwin->w_cursor.col < (colnr_T)STRLEN(ml_get_curline()))) | |
2499 | { | |
2500 | if ((p_ri && curwin->w_cursor.col) || !p_ri) | |
2501 | { | |
2502 | *************** | |
2503 | *** 565,571 **** | |
2504 | ||
2505 | tempc = gchar_cursor(); | |
2506 | ||
2507 | ! if (curwin->w_cursor.col+1 < STRLEN(ml_get_curline())) | |
2508 | { | |
2509 | inc_cursor(); | |
2510 | ||
2511 | --- 566,572 ---- | |
2512 | ||
2513 | tempc = gchar_cursor(); | |
2514 | ||
2515 | ! if (curwin->w_cursor.col + 1 < (colnr_T)STRLEN(ml_get_curline())) | |
2516 | { | |
2517 | inc_cursor(); | |
2518 | ||
2519 | *************** | |
2520 | *** 594,601 **** | |
2521 | { | |
2522 | int tempc; | |
2523 | ||
2524 | ! if (!curwin->w_cursor.col && | |
2525 | ! (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) | |
2526 | return; | |
2527 | ||
2528 | if (!curwin->w_cursor.col && p_ri) | |
2529 | --- 595,602 ---- | |
2530 | { | |
2531 | int tempc; | |
2532 | ||
2533 | ! if (curwin->w_cursor.col != 0 && | |
2534 | ! (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) | |
2535 | return; | |
2536 | ||
2537 | if (!curwin->w_cursor.col && p_ri) | |
2538 | *************** | |
2539 | *** 663,670 **** | |
2540 | { | |
2541 | int tempc; | |
2542 | ||
2543 | ! if (!curwin->w_cursor.col && | |
2544 | ! (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) | |
2545 | return; | |
2546 | ||
2547 | if (!curwin->w_cursor.col && p_ri) | |
2548 | --- 664,671 ---- | |
2549 | { | |
2550 | int tempc; | |
2551 | ||
2552 | ! if (curwin->w_cursor.col != 0 && | |
2553 | ! (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) | |
2554 | return; | |
2555 | ||
2556 | if (!curwin->w_cursor.col && p_ri) | |
2557 | *** ../vim-7.2.176/src/mark.c 2009-04-29 11:00:09.000000000 +0200 | |
2558 | --- src/mark.c 2009-05-16 17:14:56.000000000 +0200 | |
2559 | *************** | |
2560 | *** 884,893 **** | |
2561 | /* | |
2562 | * print the jumplist | |
2563 | */ | |
2564 | - /*ARGSUSED*/ | |
2565 | void | |
2566 | ex_jumps(eap) | |
2567 | ! exarg_T *eap; | |
2568 | { | |
2569 | int i; | |
2570 | char_u *name; | |
2571 | --- 884,892 ---- | |
2572 | /* | |
2573 | * print the jumplist | |
2574 | */ | |
2575 | void | |
2576 | ex_jumps(eap) | |
2577 | ! exarg_T *eap UNUSED; | |
2578 | { | |
2579 | int i; | |
2580 | char_u *name; | |
2581 | *************** | |
2582 | *** 933,942 **** | |
2583 | /* | |
2584 | * print the changelist | |
2585 | */ | |
2586 | - /*ARGSUSED*/ | |
2587 | void | |
2588 | ex_changes(eap) | |
2589 | ! exarg_T *eap; | |
2590 | { | |
2591 | int i; | |
2592 | char_u *name; | |
2593 | --- 932,940 ---- | |
2594 | /* | |
2595 | * print the changelist | |
2596 | */ | |
2597 | void | |
2598 | ex_changes(eap) | |
2599 | ! exarg_T *eap UNUSED; | |
2600 | { | |
2601 | int i; | |
2602 | char_u *name; | |
2603 | *** ../vim-7.2.176/src/menu.c 2008-08-17 23:43:53.000000000 +0200 | |
2604 | --- src/menu.c 2009-05-16 17:19:57.000000000 +0200 | |
2605 | *************** | |
2606 | *** 231,237 **** | |
2607 | if (skipdigits(menu_path + 7) == p) | |
2608 | { | |
2609 | menuarg.iconidx = atoi((char *)menu_path + 7); | |
2610 | ! if (menuarg.iconidx >= TOOLBAR_NAME_COUNT) | |
2611 | menuarg.iconidx = -1; | |
2612 | else | |
2613 | menuarg.icon_builtin = TRUE; | |
2614 | --- 231,237 ---- | |
2615 | if (skipdigits(menu_path + 7) == p) | |
2616 | { | |
2617 | menuarg.iconidx = atoi((char *)menu_path + 7); | |
2618 | ! if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT) | |
2619 | menuarg.iconidx = -1; | |
2620 | else | |
2621 | menuarg.icon_builtin = TRUE; | |
2622 | *************** | |
2623 | *** 239,245 **** | |
2624 | } | |
2625 | else | |
2626 | { | |
2627 | ! for (i = 0; i < TOOLBAR_NAME_COUNT; ++i) | |
2628 | if (STRNCMP(toolbar_names[i], menu_path, p - menu_path) | |
2629 | == 0) | |
2630 | { | |
2631 | --- 239,245 ---- | |
2632 | } | |
2633 | else | |
2634 | { | |
2635 | ! for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i) | |
2636 | if (STRNCMP(toolbar_names[i], menu_path, p - menu_path) | |
2637 | == 0) | |
2638 | { | |
2639 | *************** | |
2640 | *** 1341,1350 **** | |
2641 | * Function given to ExpandGeneric() to obtain the list of (sub)menus (not | |
2642 | * entries). | |
2643 | */ | |
2644 | - /*ARGSUSED*/ | |
2645 | char_u * | |
2646 | get_menu_name(xp, idx) | |
2647 | ! expand_T *xp; | |
2648 | int idx; | |
2649 | { | |
2650 | static vimmenu_T *menu = NULL; | |
2651 | --- 1341,1349 ---- | |
2652 | * Function given to ExpandGeneric() to obtain the list of (sub)menus (not | |
2653 | * entries). | |
2654 | */ | |
2655 | char_u * | |
2656 | get_menu_name(xp, idx) | |
2657 | ! expand_T *xp UNUSED; | |
2658 | int idx; | |
2659 | { | |
2660 | static vimmenu_T *menu = NULL; | |
2661 | *************** | |
2662 | *** 1378,1387 **** | |
2663 | * Function given to ExpandGeneric() to obtain the list of menus and menu | |
2664 | * entries. | |
2665 | */ | |
2666 | - /*ARGSUSED*/ | |
2667 | char_u * | |
2668 | get_menu_names(xp, idx) | |
2669 | ! expand_T *xp; | |
2670 | int idx; | |
2671 | { | |
2672 | static vimmenu_T *menu = NULL; | |
2673 | --- 1377,1385 ---- | |
2674 | * Function given to ExpandGeneric() to obtain the list of menus and menu | |
2675 | * entries. | |
2676 | */ | |
2677 | char_u * | |
2678 | get_menu_names(xp, idx) | |
2679 | ! expand_T *xp UNUSED; | |
2680 | int idx; | |
2681 | { | |
2682 | static vimmenu_T *menu = NULL; | |
2683 | *************** | |
2684 | *** 1739,1748 **** | |
2685 | /* | |
2686 | * Return TRUE if the menu is the tearoff menu. | |
2687 | */ | |
2688 | - /*ARGSUSED*/ | |
2689 | static int | |
2690 | menu_is_tearoff(name) | |
2691 | ! char_u *name; | |
2692 | { | |
2693 | #ifdef FEAT_GUI | |
2694 | return (STRCMP(name, TEAR_STRING) == 0); | |
2695 | --- 1737,1745 ---- | |
2696 | /* | |
2697 | * Return TRUE if the menu is the tearoff menu. | |
2698 | */ | |
2699 | static int | |
2700 | menu_is_tearoff(name) | |
2701 | ! char_u *name UNUSED; | |
2702 | { | |
2703 | #ifdef FEAT_GUI | |
2704 | return (STRCMP(name, TEAR_STRING) == 0); | |
2705 | *** ../vim-7.2.176/src/version.c 2009-05-16 16:36:25.000000000 +0200 | |
2706 | --- src/version.c 2009-05-16 17:22:08.000000000 +0200 | |
2707 | *************** | |
2708 | *** 678,679 **** | |
2709 | --- 678,681 ---- | |
2710 | { /* Add new patch number below this line */ | |
2711 | + /**/ | |
2712 | + 177, | |
2713 | /**/ | |
2714 | ||
2715 | -- | |
2716 | (letter from Mark to Mike, about the film's probable certificate) | |
2717 | For an 'A' we would have to: Lose as many shits as possible; Take Jesus | |
2718 | Christ out, if possible; Loose "I fart in your general direction"; Lose | |
2719 | "the oral sex"; Lose "oh, fuck off"; Lose "We make castanets out of your | |
2720 | testicles" | |
2721 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
2722 | ||
2723 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
2724 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
2725 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
2726 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |