1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.102
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.102
Problem: When using ":make", typing the next command and then getting the
"reload" prompt the next command is (partly) eaten by the reload
prompt.
Solution: Accept ':' as a special character at the reload prompt to accept
the default choice and execute the command.
Files: src/eval.c, src/fileio.c, src/gui.c, src/gui_xmdlg.c,
src/memline.c, src/message.c, src/proto/message.pro,
src/gui_athena.c, src/gui_gtk.c, src/gui_mac.c, src/gui_motif.c,
src/gui_photon.c, src/gui_w16.c, src/gui_w32.c, src/os_mswin.c
src/proto/gui_athena.pro, src/proto/gui_gtk.pro,
src/proto/gui_mac.pro, src/proto/gui_motif.pro,
src/proto/gui_photon.pro, src/proto/gui_w16.pro,
src/proto/gui_w32.pro
*** ../vim-7.3.101/src/eval.c 2011-01-04 19:03:22.000000000 +0100
--- src/eval.c 2011-01-16 00:14:21.000000000 +0100
***************
*** 9323,9329 ****
if (!error)
rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
! def, NULL);
#endif
}
--- 9323,9329 ----
if (!error)
rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
! def, NULL, FALSE);
#endif
}
***************
*** 12744,12750 ****
IObuff[0] = NUL;
if (message != NULL && defstr != NULL
&& do_dialog(VIM_QUESTION, NULL, message,
! (char_u *)_("&OK\n&Cancel"), 1, IObuff) == 1)
rettv->vval.v_string = vim_strsave(IObuff);
else
{
--- 12744,12750 ----
IObuff[0] = NUL;
if (message != NULL && defstr != NULL
&& do_dialog(VIM_QUESTION, NULL, message,
! (char_u *)_("&OK\n&Cancel"), 1, IObuff, FALSE) == 1)
rettv->vval.v_string = vim_strsave(IObuff);
else
{
*** ../vim-7.3.101/src/fileio.c 2010-12-17 18:06:00.000000000 +0100
--- src/fileio.c 2011-01-16 00:14:37.000000000 +0100
***************
*** 7008,7014 ****
STRCAT(tbuf, mesg2);
}
if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
! (char_u *)_("&OK\n&Load File"), 1, NULL) == 2)
reload = TRUE;
}
else
--- 7008,7014 ----
STRCAT(tbuf, mesg2);
}
if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
! (char_u *)_("&OK\n&Load File"), 1, NULL, TRUE) == 2)
reload = TRUE;
}
else
*** ../vim-7.3.101/src/gui.c 2010-10-20 19:17:43.000000000 +0200
--- src/gui.c 2011-01-16 00:14:56.000000000 +0100
***************
*** 4903,4909 ****
if (STRLEN(p) > 2000)
STRCPY(p + 2000 - 14, "...(truncated)");
(void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
! p, (char_u *)_("&Ok"), 1, NULL);
break;
}
ga_clear(&error_ga);
--- 4903,4909 ----
if (STRLEN(p) > 2000)
STRCPY(p + 2000 - 14, "...(truncated)");
(void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
! p, (char_u *)_("&Ok"), 1, NULL, FALSE);
break;
}
ga_clear(&error_ga);
*** ../vim-7.3.101/src/gui_xmdlg.c 2010-08-15 21:57:32.000000000 +0200
--- src/gui_xmdlg.c 2011-01-16 00:15:33.000000000 +0100
***************
*** 688,694 ****
do_dialog(VIM_ERROR,
(char_u *)_("Error"),
(char_u *)_("Invalid font specification"),
! (char_u *)_("&Dismiss"), 1, NULL);
return True;
}
--- 688,694 ----
do_dialog(VIM_ERROR,
(char_u *)_("Error"),
(char_u *)_("Invalid font specification"),
! (char_u *)_("&Dismiss"), 1, NULL, FALSE);
return True;
}
***************
*** 807,813 ****
do_dialog(VIM_ERROR,
(char_u *)_("Error"),
(char_u *)_("Invalid font specification"),
! (char_u *)_("&Dismiss"), 1, NULL);
XFreeFontNames(name);
}
else
--- 807,813 ----
do_dialog(VIM_ERROR,
(char_u *)_("Error"),
(char_u *)_("Invalid font specification"),
! (char_u *)_("&Dismiss"), 1, NULL, FALSE);
XFreeFontNames(name);
}
else
*** ../vim-7.3.101/src/memline.c 2010-12-17 20:23:56.000000000 +0100
--- src/memline.c 2011-01-16 00:15:47.000000000 +0100
***************
*** 4516,4522 ****
process_still_running
? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
# endif
! (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL);
# if defined(UNIX) || defined(__EMX__) || defined(VMS)
if (process_still_running && choice >= 4)
--- 4516,4522 ----
process_still_running
? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
# endif
! (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
# if defined(UNIX) || defined(__EMX__) || defined(VMS)
if (process_still_running && choice >= 4)
*** ../vim-7.3.101/src/message.c 2011-01-04 19:25:46.000000000 +0100
--- src/message.c 2011-01-17 19:57:30.000000000 +0100
***************
*** 3315,3321 ****
* different letter.
*/
int
! do_dialog(type, title, message, buttons, dfltbutton, textfield)
int type UNUSED;
char_u *title UNUSED;
char_u *message;
--- 3315,3321 ----
* different letter.
*/
int
! do_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
int type UNUSED;
char_u *title UNUSED;
char_u *message;
***************
*** 3323,3328 ****
--- 3323,3330 ----
int dfltbutton;
char_u *textfield UNUSED; /* IObuff for inputdialog(), NULL
otherwise */
+ int ex_cmd; /* when TRUE pressing : accepts default and starts
+ Ex command */
{
int oldState;
int retval = 0;
***************
*** 3341,3347 ****
if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
{
c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
! textfield);
/* avoid a hit-enter prompt without clearing the cmdline */
need_wait_return = FALSE;
emsg_on_display = FALSE;
--- 3343,3349 ----
if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
{
c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
! textfield, ex_cmd);
/* avoid a hit-enter prompt without clearing the cmdline */
need_wait_return = FALSE;
emsg_on_display = FALSE;
***************
*** 3388,3393 ****
--- 3390,3402 ----
default: /* Could be a hotkey? */
if (c < 0) /* special keys are ignored here */
continue;
+ if (c == ':' && ex_cmd)
+ {
+ retval = dfltbutton;
+ ins_char_typebuf(':');
+ break;
+ }
+
/* Make the character lowercase, as chars in "hotkeys" are. */
c = MB_TOLOWER(c);
retval = 1;
***************
*** 3661,3667 ****
if (do_dialog(type,
title == NULL ? (char_u *)_("Question") : title,
message,
! (char_u *)_("&Yes\n&No"), dflt, NULL) == 1)
return VIM_YES;
return VIM_NO;
}
--- 3670,3676 ----
if (do_dialog(type,
title == NULL ? (char_u *)_("Question") : title,
message,
! (char_u *)_("&Yes\n&No"), dflt, NULL, FALSE) == 1)
return VIM_YES;
return VIM_NO;
}
***************
*** 3676,3682 ****
switch (do_dialog(type,
title == NULL ? (char_u *)_("Question") : title,
message,
! (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL))
{
case 1: return VIM_YES;
case 2: return VIM_NO;
--- 3685,3691 ----
switch (do_dialog(type,
title == NULL ? (char_u *)_("Question") : title,
message,
! (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, FALSE))
{
case 1: return VIM_YES;
case 2: return VIM_NO;
***************
*** 3695,3701 ****
title == NULL ? (char_u *)"Question" : title,
message,
(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
! dflt, NULL))
{
case 1: return VIM_YES;
case 2: return VIM_NO;
--- 3704,3710 ----
title == NULL ? (char_u *)"Question" : title,
message,
(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
! dflt, NULL, FALSE))
{
case 1: return VIM_YES;
case 2: return VIM_NO;
*** ../vim-7.3.101/src/proto/message.pro 2010-10-20 21:22:17.000000000 +0200
--- src/proto/message.pro 2011-01-16 00:22:36.000000000 +0100
***************
*** 64,70 ****
int verbose_open __ARGS((void));
void give_warning __ARGS((char_u *message, int hl));
void msg_advance __ARGS((int col));
! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
void display_confirm_msg __ARGS((void));
int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
--- 64,70 ----
int verbose_open __ARGS((void));
void give_warning __ARGS((char_u *message, int hl));
void msg_advance __ARGS((int col));
! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
void display_confirm_msg __ARGS((void));
int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
*** ../vim-7.3.101/src/gui_athena.c 2010-08-15 21:57:25.000000000 +0200
--- src/gui_athena.c 2011-01-16 00:18:47.000000000 +0100
***************
*** 2117,2129 ****
}
int
! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
int type UNUSED;
char_u *title;
char_u *message;
char_u *buttons;
int dfltbutton UNUSED;
char_u *textfield;
{
char_u *buts;
char_u *p, *next;
--- 2117,2130 ----
}
int
! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
int type UNUSED;
char_u *title;
char_u *message;
char_u *buttons;
int dfltbutton UNUSED;
char_u *textfield;
+ int ex_cmd UNUSED;
{
char_u *buts;
char_u *p, *next;
*** ../vim-7.3.101/src/gui_gtk.c 2010-12-08 13:11:15.000000000 +0100
--- src/gui_gtk.c 2011-01-16 00:24:44.000000000 +0100
***************
*** 1268,1274 ****
char_u *message, /* message text */
char_u *buttons, /* names of buttons */
int def_but, /* default button */
! char_u *textfield) /* text for textfield or NULL */
{
GtkWidget *dialog;
GtkWidget *entry = NULL;
--- 1268,1275 ----
char_u *message, /* message text */
char_u *buttons, /* names of buttons */
int def_but, /* default button */
! char_u *textfield, /* text for textfield or NULL */
! int ex_cmd UNUSED)
{
GtkWidget *dialog;
GtkWidget *entry = NULL;
*** ../vim-7.3.101/src/gui_mac.c 2010-09-21 17:34:26.000000000 +0200
--- src/gui_mac.c 2011-01-16 00:19:52.000000000 +0100
***************
*** 5583,5589 ****
char_u *message,
char_u *buttons,
int dfltbutton,
! char_u *textfield)
{
Handle buttonDITL;
Handle iconDITL;
--- 5583,5590 ----
char_u *message,
char_u *buttons,
int dfltbutton,
! char_u *textfield,
! int ex_cmd)
{
Handle buttonDITL;
Handle iconDITL;
*** ../vim-7.3.101/src/gui_motif.c 2010-08-15 21:57:28.000000000 +0200
--- src/gui_motif.c 2011-01-16 00:20:14.000000000 +0100
***************
*** 2549,2561 ****
#endif
int
! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
int type UNUSED;
char_u *title;
char_u *message;
char_u *button_names;
int dfltbutton;
char_u *textfield; /* buffer of size IOSIZE */
{
char_u *buts;
char_u *p, *next;
--- 2549,2562 ----
#endif
int
! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield, ex_cmd)
int type UNUSED;
char_u *title;
char_u *message;
char_u *button_names;
int dfltbutton;
char_u *textfield; /* buffer of size IOSIZE */
+ int ex_cmd UNUSED;
{
char_u *buts;
char_u *p, *next;
*** ../vim-7.3.101/src/gui_photon.c 2010-08-15 21:57:27.000000000 +0200
--- src/gui_photon.c 2011-01-16 00:20:28.000000000 +0100
***************
*** 1502,1508 ****
char_u *message,
char_u *buttons,
int default_button,
! char_u *textfield)
{
char_u *str;
char_u **button_array;
--- 1502,1509 ----
char_u *message,
char_u *buttons,
int default_button,
! char_u *textfield,
! int ex_cmd)
{
char_u *str;
char_u **button_array;
*** ../vim-7.3.101/src/gui_w16.c 2010-08-15 21:57:28.000000000 +0200
--- src/gui_w16.c 2011-01-16 00:20:48.000000000 +0100
***************
*** 1098,1104 ****
char_u *message,
char_u *buttons,
int dfltbutton,
! char_u *textfield)
{
FARPROC dp;
LPWORD p, pnumitems;
--- 1098,1105 ----
char_u *message,
char_u *buttons,
int dfltbutton,
! char_u *textfield,
! int ex_cmd)
{
FARPROC dp;
LPWORD p, pnumitems;
*** ../vim-7.3.101/src/gui_w32.c 2010-10-27 12:33:12.000000000 +0200
--- src/gui_w32.c 2011-01-16 00:21:08.000000000 +0100
***************
*** 3005,3011 ****
char_u *message,
char_u *buttons,
int dfltbutton,
! char_u *textfield)
{
WORD *p, *pdlgtemplate, *pnumitems;
DWORD *dwp;
--- 3005,3012 ----
char_u *message,
char_u *buttons,
int dfltbutton,
! char_u *textfield,
! int ex_cmd)
{
WORD *p, *pdlgtemplate, *pnumitems;
DWORD *dwp;
*** ../vim-7.3.101/src/os_mswin.c 2010-12-17 20:23:56.000000000 +0100
--- src/os_mswin.c 2011-01-16 00:21:41.000000000 +0100
***************
*** 593,599 ****
gui.starting ? (char_u *)_("Message") :
#endif
(char_u *)_("Error"),
! p, (char_u *)_("&Ok"), 1, NULL);
break;
}
ga_clear(&error_ga);
--- 593,599 ----
gui.starting ? (char_u *)_("Message") :
#endif
(char_u *)_("Error"),
! p, (char_u *)_("&Ok"), 1, NULL, FALSE);
break;
}
ga_clear(&error_ga);
*** ../vim-7.3.101/src/proto/gui_athena.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_athena.pro 2011-01-16 00:23:00.000000000 +0100
***************
*** 27,31 ****
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
Window gui_x11_get_wid __ARGS((void));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
/* vim: set ft=c : */
--- 27,31 ----
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
Window gui_x11_get_wid __ARGS((void));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
/* vim: set ft=c : */
*** ../vim-7.3.101/src/proto/gui_gtk.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_gtk.pro 2011-01-16 00:22:57.000000000 +0100
***************
*** 13,19 ****
void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
void gui_mch_find_dialog __ARGS((exarg_T *eap));
--- 13,19 ----
void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield, int ex_cmd));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
void gui_mch_find_dialog __ARGS((exarg_T *eap));
*** ../vim-7.3.101/src/proto/gui_mac.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_mac.pro 2011-01-16 00:31:46.000000000 +0100
***************
*** 81,87 ****
int gui_mch_get_mouse_y __ARGS((void));
void gui_mch_setmouse __ARGS((int x, int y));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
void gui_mch_set_foreground __ARGS((void));
void gui_mch_show_tabline __ARGS((int showit));
--- 81,87 ----
int gui_mch_get_mouse_y __ARGS((void));
void gui_mch_setmouse __ARGS((int x, int y));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
void gui_mch_set_foreground __ARGS((void));
void gui_mch_show_tabline __ARGS((int showit));
*** ../vim-7.3.101/src/proto/gui_motif.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_motif.pro 2011-01-16 00:22:58.000000000 +0100
***************
*** 29,35 ****
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
Window gui_x11_get_wid __ARGS((void));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield));
void gui_mch_enable_footer __ARGS((int showit));
void gui_mch_set_footer __ARGS((char_u *s));
void gui_mch_show_toolbar __ARGS((int showit));
--- 29,35 ----
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
Window gui_x11_get_wid __ARGS((void));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield, int ex_cmd));
void gui_mch_enable_footer __ARGS((int showit));
void gui_mch_set_footer __ARGS((char_u *s));
void gui_mch_show_toolbar __ARGS((int showit));
*** ../vim-7.3.101/src/proto/gui_photon.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_photon.pro 2011-01-16 00:32:33.000000000 +0100
***************
*** 8,14 ****
void gui_mch_update __ARGS((void));
int gui_mch_wait_for_chars __ARGS((int wtime));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield));
int gui_mch_get_winpos __ARGS((int *x, int *y));
void gui_mch_set_winpos __ARGS((int x, int y));
void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
--- 8,14 ----
void gui_mch_update __ARGS((void));
int gui_mch_wait_for_chars __ARGS((int wtime));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield, int ex_cmd));
int gui_mch_get_winpos __ARGS((int *x, int *y));
void gui_mch_set_winpos __ARGS((int x, int y));
void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
*** ../vim-7.3.101/src/proto/gui_w16.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_w16.pro 2011-01-16 00:34:36.000000000 +0100
***************
*** 74,79 ****
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
void gui_mch_set_foreground __ARGS((void));
/* vim: set ft=c : */
--- 74,79 ----
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
void gui_mch_set_foreground __ARGS((void));
/* vim: set ft=c : */
*** ../vim-7.3.101/src/proto/gui_w32.pro 2010-08-15 21:57:28.000000000 +0200
--- src/proto/gui_w32.pro 2011-01-16 00:33:12.000000000 +0100
***************
*** 81,87 ****
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
void gui_mch_set_foreground __ARGS((void));
void gui_mch_drawsign __ARGS((int row, int col, int typenr));
void *gui_mch_register_sign __ARGS((char_u *signfile));
--- 81,87 ----
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
void gui_mch_set_foreground __ARGS((void));
void gui_mch_drawsign __ARGS((int row, int col, int typenr));
void *gui_mch_register_sign __ARGS((char_u *signfile));
*** ../vim-7.3.101/src/version.c 2011-01-17 19:53:20.000000000 +0100
--- src/version.c 2011-01-17 20:05:02.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 102,
/**/
--
hundred-and-one symptoms of being an internet addict:
110. You actually volunteer to become your employer's webmaster.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
