|
 |
adcb8af |
To: vim_dev@googlegroups.com
|
|
|
adcb8af |
Subject: Patch 7.3.102
|
|
|
adcb8af |
Fcc: outbox
|
|
|
adcb8af |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
adcb8af |
Mime-Version: 1.0
|
|
|
adcb8af |
Content-Type: text/plain; charset=UTF-8
|
|
|
adcb8af |
Content-Transfer-Encoding: 8bit
|
|
|
adcb8af |
------------
|
|
|
adcb8af |
|
|
|
adcb8af |
Patch 7.3.102
|
|
|
adcb8af |
Problem: When using ":make", typing the next command and then getting the
|
|
|
adcb8af |
"reload" prompt the next command is (partly) eaten by the reload
|
|
|
adcb8af |
prompt.
|
|
|
adcb8af |
Solution: Accept ':' as a special character at the reload prompt to accept
|
|
|
adcb8af |
the default choice and execute the command.
|
|
|
adcb8af |
Files: src/eval.c, src/fileio.c, src/gui.c, src/gui_xmdlg.c,
|
|
|
adcb8af |
src/memline.c, src/message.c, src/proto/message.pro,
|
|
|
adcb8af |
src/gui_athena.c, src/gui_gtk.c, src/gui_mac.c, src/gui_motif.c,
|
|
|
adcb8af |
src/gui_photon.c, src/gui_w16.c, src/gui_w32.c, src/os_mswin.c
|
|
|
adcb8af |
src/proto/gui_athena.pro, src/proto/gui_gtk.pro,
|
|
|
adcb8af |
src/proto/gui_mac.pro, src/proto/gui_motif.pro,
|
|
|
adcb8af |
src/proto/gui_photon.pro, src/proto/gui_w16.pro,
|
|
|
adcb8af |
src/proto/gui_w32.pro
|
|
|
adcb8af |
|
|
|
adcb8af |
|
|
|
adcb8af |
*** ../vim-7.3.101/src/eval.c 2011-01-04 19:03:22.000000000 +0100
|
|
|
adcb8af |
--- src/eval.c 2011-01-16 00:14:21.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 9323,9329 ****
|
|
|
adcb8af |
|
|
|
adcb8af |
if (!error)
|
|
|
adcb8af |
rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
|
|
|
adcb8af |
! def, NULL);
|
|
|
adcb8af |
#endif
|
|
|
adcb8af |
}
|
|
|
adcb8af |
|
|
|
adcb8af |
--- 9323,9329 ----
|
|
|
adcb8af |
|
|
|
adcb8af |
if (!error)
|
|
|
adcb8af |
rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
|
|
|
adcb8af |
! def, NULL, FALSE);
|
|
|
adcb8af |
#endif
|
|
|
adcb8af |
}
|
|
|
adcb8af |
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 12744,12750 ****
|
|
|
adcb8af |
IObuff[0] = NUL;
|
|
|
adcb8af |
if (message != NULL && defstr != NULL
|
|
|
adcb8af |
&& do_dialog(VIM_QUESTION, NULL, message,
|
|
|
adcb8af |
! (char_u *)_("&OK\n&Cancel"), 1, IObuff) == 1)
|
|
|
adcb8af |
rettv->vval.v_string = vim_strsave(IObuff);
|
|
|
adcb8af |
else
|
|
|
adcb8af |
{
|
|
|
adcb8af |
--- 12744,12750 ----
|
|
|
adcb8af |
IObuff[0] = NUL;
|
|
|
adcb8af |
if (message != NULL && defstr != NULL
|
|
|
adcb8af |
&& do_dialog(VIM_QUESTION, NULL, message,
|
|
|
adcb8af |
! (char_u *)_("&OK\n&Cancel"), 1, IObuff, FALSE) == 1)
|
|
|
adcb8af |
rettv->vval.v_string = vim_strsave(IObuff);
|
|
|
adcb8af |
else
|
|
|
adcb8af |
{
|
|
|
adcb8af |
*** ../vim-7.3.101/src/fileio.c 2010-12-17 18:06:00.000000000 +0100
|
|
|
adcb8af |
--- src/fileio.c 2011-01-16 00:14:37.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 7008,7014 ****
|
|
|
adcb8af |
STRCAT(tbuf, mesg2);
|
|
|
adcb8af |
}
|
|
|
adcb8af |
if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
|
|
|
adcb8af |
! (char_u *)_("&OK\n&Load File"), 1, NULL) == 2)
|
|
|
adcb8af |
reload = TRUE;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
else
|
|
|
adcb8af |
--- 7008,7014 ----
|
|
|
adcb8af |
STRCAT(tbuf, mesg2);
|
|
|
adcb8af |
}
|
|
|
adcb8af |
if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
|
|
|
adcb8af |
! (char_u *)_("&OK\n&Load File"), 1, NULL, TRUE) == 2)
|
|
|
adcb8af |
reload = TRUE;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
else
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui.c 2010-10-20 19:17:43.000000000 +0200
|
|
|
adcb8af |
--- src/gui.c 2011-01-16 00:14:56.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 4903,4909 ****
|
|
|
adcb8af |
if (STRLEN(p) > 2000)
|
|
|
adcb8af |
STRCPY(p + 2000 - 14, "...(truncated)");
|
|
|
adcb8af |
(void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
|
|
|
adcb8af |
! p, (char_u *)_("&Ok"), 1, NULL);
|
|
|
adcb8af |
break;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
ga_clear(&error_ga);
|
|
|
adcb8af |
--- 4903,4909 ----
|
|
|
adcb8af |
if (STRLEN(p) > 2000)
|
|
|
adcb8af |
STRCPY(p + 2000 - 14, "...(truncated)");
|
|
|
adcb8af |
(void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
|
|
|
adcb8af |
! p, (char_u *)_("&Ok"), 1, NULL, FALSE);
|
|
|
adcb8af |
break;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
ga_clear(&error_ga);
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_xmdlg.c 2010-08-15 21:57:32.000000000 +0200
|
|
|
adcb8af |
--- src/gui_xmdlg.c 2011-01-16 00:15:33.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 688,694 ****
|
|
|
adcb8af |
do_dialog(VIM_ERROR,
|
|
|
adcb8af |
(char_u *)_("Error"),
|
|
|
adcb8af |
(char_u *)_("Invalid font specification"),
|
|
|
adcb8af |
! (char_u *)_("&Dismiss"), 1, NULL);
|
|
|
adcb8af |
|
|
|
adcb8af |
return True;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
--- 688,694 ----
|
|
|
adcb8af |
do_dialog(VIM_ERROR,
|
|
|
adcb8af |
(char_u *)_("Error"),
|
|
|
adcb8af |
(char_u *)_("Invalid font specification"),
|
|
|
adcb8af |
! (char_u *)_("&Dismiss"), 1, NULL, FALSE);
|
|
|
adcb8af |
|
|
|
adcb8af |
return True;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 807,813 ****
|
|
|
adcb8af |
do_dialog(VIM_ERROR,
|
|
|
adcb8af |
(char_u *)_("Error"),
|
|
|
adcb8af |
(char_u *)_("Invalid font specification"),
|
|
|
adcb8af |
! (char_u *)_("&Dismiss"), 1, NULL);
|
|
|
adcb8af |
XFreeFontNames(name);
|
|
|
adcb8af |
}
|
|
|
adcb8af |
else
|
|
|
adcb8af |
--- 807,813 ----
|
|
|
adcb8af |
do_dialog(VIM_ERROR,
|
|
|
adcb8af |
(char_u *)_("Error"),
|
|
|
adcb8af |
(char_u *)_("Invalid font specification"),
|
|
|
adcb8af |
! (char_u *)_("&Dismiss"), 1, NULL, FALSE);
|
|
|
adcb8af |
XFreeFontNames(name);
|
|
|
adcb8af |
}
|
|
|
adcb8af |
else
|
|
|
adcb8af |
*** ../vim-7.3.101/src/memline.c 2010-12-17 20:23:56.000000000 +0100
|
|
|
adcb8af |
--- src/memline.c 2011-01-16 00:15:47.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 4516,4522 ****
|
|
|
adcb8af |
process_still_running
|
|
|
adcb8af |
? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
|
|
|
adcb8af |
# endif
|
|
|
adcb8af |
! (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL);
|
|
|
adcb8af |
|
|
|
adcb8af |
# if defined(UNIX) || defined(__EMX__) || defined(VMS)
|
|
|
adcb8af |
if (process_still_running && choice >= 4)
|
|
|
adcb8af |
--- 4516,4522 ----
|
|
|
adcb8af |
process_still_running
|
|
|
adcb8af |
? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
|
|
|
adcb8af |
# endif
|
|
|
adcb8af |
! (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
|
|
|
adcb8af |
|
|
|
adcb8af |
# if defined(UNIX) || defined(__EMX__) || defined(VMS)
|
|
|
adcb8af |
if (process_still_running && choice >= 4)
|
|
|
adcb8af |
*** ../vim-7.3.101/src/message.c 2011-01-04 19:25:46.000000000 +0100
|
|
|
adcb8af |
--- src/message.c 2011-01-17 19:57:30.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3315,3321 ****
|
|
|
adcb8af |
* different letter.
|
|
|
adcb8af |
*/
|
|
|
adcb8af |
int
|
|
|
adcb8af |
! do_dialog(type, title, message, buttons, dfltbutton, textfield)
|
|
|
adcb8af |
int type UNUSED;
|
|
|
adcb8af |
char_u *title UNUSED;
|
|
|
adcb8af |
char_u *message;
|
|
|
adcb8af |
--- 3315,3321 ----
|
|
|
adcb8af |
* different letter.
|
|
|
adcb8af |
*/
|
|
|
adcb8af |
int
|
|
|
adcb8af |
! do_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
|
|
|
adcb8af |
int type UNUSED;
|
|
|
adcb8af |
char_u *title UNUSED;
|
|
|
adcb8af |
char_u *message;
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3323,3328 ****
|
|
|
adcb8af |
--- 3323,3330 ----
|
|
|
adcb8af |
int dfltbutton;
|
|
|
adcb8af |
char_u *textfield UNUSED; /* IObuff for inputdialog(), NULL
|
|
|
adcb8af |
otherwise */
|
|
|
adcb8af |
+ int ex_cmd; /* when TRUE pressing : accepts default and starts
|
|
|
adcb8af |
+ Ex command */
|
|
|
adcb8af |
{
|
|
|
adcb8af |
int oldState;
|
|
|
adcb8af |
int retval = 0;
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3341,3347 ****
|
|
|
adcb8af |
if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
|
|
|
adcb8af |
! textfield);
|
|
|
adcb8af |
/* avoid a hit-enter prompt without clearing the cmdline */
|
|
|
adcb8af |
need_wait_return = FALSE;
|
|
|
adcb8af |
emsg_on_display = FALSE;
|
|
|
adcb8af |
--- 3343,3349 ----
|
|
|
adcb8af |
if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
|
|
|
adcb8af |
! textfield, ex_cmd);
|
|
|
adcb8af |
/* avoid a hit-enter prompt without clearing the cmdline */
|
|
|
adcb8af |
need_wait_return = FALSE;
|
|
|
adcb8af |
emsg_on_display = FALSE;
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3388,3393 ****
|
|
|
adcb8af |
--- 3390,3402 ----
|
|
|
adcb8af |
default: /* Could be a hotkey? */
|
|
|
adcb8af |
if (c < 0) /* special keys are ignored here */
|
|
|
adcb8af |
continue;
|
|
|
adcb8af |
+ if (c == ':' && ex_cmd)
|
|
|
adcb8af |
+ {
|
|
|
adcb8af |
+ retval = dfltbutton;
|
|
|
adcb8af |
+ ins_char_typebuf(':');
|
|
|
adcb8af |
+ break;
|
|
|
adcb8af |
+ }
|
|
|
adcb8af |
+
|
|
|
adcb8af |
/* Make the character lowercase, as chars in "hotkeys" are. */
|
|
|
adcb8af |
c = MB_TOLOWER(c);
|
|
|
adcb8af |
retval = 1;
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3661,3667 ****
|
|
|
adcb8af |
if (do_dialog(type,
|
|
|
adcb8af |
title == NULL ? (char_u *)_("Question") : title,
|
|
|
adcb8af |
message,
|
|
|
adcb8af |
! (char_u *)_("&Yes\n&No"), dflt, NULL) == 1)
|
|
|
adcb8af |
return VIM_YES;
|
|
|
adcb8af |
return VIM_NO;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
--- 3670,3676 ----
|
|
|
adcb8af |
if (do_dialog(type,
|
|
|
adcb8af |
title == NULL ? (char_u *)_("Question") : title,
|
|
|
adcb8af |
message,
|
|
|
adcb8af |
! (char_u *)_("&Yes\n&No"), dflt, NULL, FALSE) == 1)
|
|
|
adcb8af |
return VIM_YES;
|
|
|
adcb8af |
return VIM_NO;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3676,3682 ****
|
|
|
adcb8af |
switch (do_dialog(type,
|
|
|
adcb8af |
title == NULL ? (char_u *)_("Question") : title,
|
|
|
adcb8af |
message,
|
|
|
adcb8af |
! (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL))
|
|
|
adcb8af |
{
|
|
|
adcb8af |
case 1: return VIM_YES;
|
|
|
adcb8af |
case 2: return VIM_NO;
|
|
|
adcb8af |
--- 3685,3691 ----
|
|
|
adcb8af |
switch (do_dialog(type,
|
|
|
adcb8af |
title == NULL ? (char_u *)_("Question") : title,
|
|
|
adcb8af |
message,
|
|
|
adcb8af |
! (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, FALSE))
|
|
|
adcb8af |
{
|
|
|
adcb8af |
case 1: return VIM_YES;
|
|
|
adcb8af |
case 2: return VIM_NO;
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3695,3701 ****
|
|
|
adcb8af |
title == NULL ? (char_u *)"Question" : title,
|
|
|
adcb8af |
message,
|
|
|
adcb8af |
(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
|
|
|
adcb8af |
! dflt, NULL))
|
|
|
adcb8af |
{
|
|
|
adcb8af |
case 1: return VIM_YES;
|
|
|
adcb8af |
case 2: return VIM_NO;
|
|
|
adcb8af |
--- 3704,3710 ----
|
|
|
adcb8af |
title == NULL ? (char_u *)"Question" : title,
|
|
|
adcb8af |
message,
|
|
|
adcb8af |
(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
|
|
|
adcb8af |
! dflt, NULL, FALSE))
|
|
|
adcb8af |
{
|
|
|
adcb8af |
case 1: return VIM_YES;
|
|
|
adcb8af |
case 2: return VIM_NO;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/message.pro 2010-10-20 21:22:17.000000000 +0200
|
|
|
adcb8af |
--- src/proto/message.pro 2011-01-16 00:22:36.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 64,70 ****
|
|
|
adcb8af |
int verbose_open __ARGS((void));
|
|
|
adcb8af |
void give_warning __ARGS((char_u *message, int hl));
|
|
|
adcb8af |
void msg_advance __ARGS((int col));
|
|
|
adcb8af |
! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
|
|
|
adcb8af |
void display_confirm_msg __ARGS((void));
|
|
|
adcb8af |
int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
|
|
|
adcb8af |
int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
|
|
|
adcb8af |
--- 64,70 ----
|
|
|
adcb8af |
int verbose_open __ARGS((void));
|
|
|
adcb8af |
void give_warning __ARGS((char_u *message, int hl));
|
|
|
adcb8af |
void msg_advance __ARGS((int col));
|
|
|
adcb8af |
! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
|
|
|
adcb8af |
void display_confirm_msg __ARGS((void));
|
|
|
adcb8af |
int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
|
|
|
adcb8af |
int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_athena.c 2010-08-15 21:57:25.000000000 +0200
|
|
|
adcb8af |
--- src/gui_athena.c 2011-01-16 00:18:47.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 2117,2129 ****
|
|
|
adcb8af |
}
|
|
|
adcb8af |
|
|
|
adcb8af |
int
|
|
|
adcb8af |
! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
|
|
|
adcb8af |
int type UNUSED;
|
|
|
adcb8af |
char_u *title;
|
|
|
adcb8af |
char_u *message;
|
|
|
adcb8af |
char_u *buttons;
|
|
|
adcb8af |
int dfltbutton UNUSED;
|
|
|
adcb8af |
char_u *textfield;
|
|
|
adcb8af |
{
|
|
|
adcb8af |
char_u *buts;
|
|
|
adcb8af |
char_u *p, *next;
|
|
|
adcb8af |
--- 2117,2130 ----
|
|
|
adcb8af |
}
|
|
|
adcb8af |
|
|
|
adcb8af |
int
|
|
|
adcb8af |
! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
|
|
|
adcb8af |
int type UNUSED;
|
|
|
adcb8af |
char_u *title;
|
|
|
adcb8af |
char_u *message;
|
|
|
adcb8af |
char_u *buttons;
|
|
|
adcb8af |
int dfltbutton UNUSED;
|
|
|
adcb8af |
char_u *textfield;
|
|
|
adcb8af |
+ int ex_cmd UNUSED;
|
|
|
adcb8af |
{
|
|
|
adcb8af |
char_u *buts;
|
|
|
adcb8af |
char_u *p, *next;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_gtk.c 2010-12-08 13:11:15.000000000 +0100
|
|
|
adcb8af |
--- src/gui_gtk.c 2011-01-16 00:24:44.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 1268,1274 ****
|
|
|
adcb8af |
char_u *message, /* message text */
|
|
|
adcb8af |
char_u *buttons, /* names of buttons */
|
|
|
adcb8af |
int def_but, /* default button */
|
|
|
adcb8af |
! char_u *textfield) /* text for textfield or NULL */
|
|
|
adcb8af |
{
|
|
|
adcb8af |
GtkWidget *dialog;
|
|
|
adcb8af |
GtkWidget *entry = NULL;
|
|
|
adcb8af |
--- 1268,1275 ----
|
|
|
adcb8af |
char_u *message, /* message text */
|
|
|
adcb8af |
char_u *buttons, /* names of buttons */
|
|
|
adcb8af |
int def_but, /* default button */
|
|
|
adcb8af |
! char_u *textfield, /* text for textfield or NULL */
|
|
|
adcb8af |
! int ex_cmd UNUSED)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
GtkWidget *dialog;
|
|
|
adcb8af |
GtkWidget *entry = NULL;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_mac.c 2010-09-21 17:34:26.000000000 +0200
|
|
|
adcb8af |
--- src/gui_mac.c 2011-01-16 00:19:52.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 5583,5589 ****
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int dfltbutton,
|
|
|
adcb8af |
! char_u *textfield)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
Handle buttonDITL;
|
|
|
adcb8af |
Handle iconDITL;
|
|
|
adcb8af |
--- 5583,5590 ----
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int dfltbutton,
|
|
|
adcb8af |
! char_u *textfield,
|
|
|
adcb8af |
! int ex_cmd)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
Handle buttonDITL;
|
|
|
adcb8af |
Handle iconDITL;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_motif.c 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/gui_motif.c 2011-01-16 00:20:14.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 2549,2561 ****
|
|
|
adcb8af |
#endif
|
|
|
adcb8af |
|
|
|
adcb8af |
int
|
|
|
adcb8af |
! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
|
|
|
adcb8af |
int type UNUSED;
|
|
|
adcb8af |
char_u *title;
|
|
|
adcb8af |
char_u *message;
|
|
|
adcb8af |
char_u *button_names;
|
|
|
adcb8af |
int dfltbutton;
|
|
|
adcb8af |
char_u *textfield; /* buffer of size IOSIZE */
|
|
|
adcb8af |
{
|
|
|
adcb8af |
char_u *buts;
|
|
|
adcb8af |
char_u *p, *next;
|
|
|
adcb8af |
--- 2549,2562 ----
|
|
|
adcb8af |
#endif
|
|
|
adcb8af |
|
|
|
adcb8af |
int
|
|
|
adcb8af |
! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield, ex_cmd)
|
|
|
adcb8af |
int type UNUSED;
|
|
|
adcb8af |
char_u *title;
|
|
|
adcb8af |
char_u *message;
|
|
|
adcb8af |
char_u *button_names;
|
|
|
adcb8af |
int dfltbutton;
|
|
|
adcb8af |
char_u *textfield; /* buffer of size IOSIZE */
|
|
|
adcb8af |
+ int ex_cmd UNUSED;
|
|
|
adcb8af |
{
|
|
|
adcb8af |
char_u *buts;
|
|
|
adcb8af |
char_u *p, *next;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_photon.c 2010-08-15 21:57:27.000000000 +0200
|
|
|
adcb8af |
--- src/gui_photon.c 2011-01-16 00:20:28.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 1502,1508 ****
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int default_button,
|
|
|
adcb8af |
! char_u *textfield)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
char_u *str;
|
|
|
adcb8af |
char_u **button_array;
|
|
|
adcb8af |
--- 1502,1509 ----
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int default_button,
|
|
|
adcb8af |
! char_u *textfield,
|
|
|
adcb8af |
! int ex_cmd)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
char_u *str;
|
|
|
adcb8af |
char_u **button_array;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_w16.c 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/gui_w16.c 2011-01-16 00:20:48.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 1098,1104 ****
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int dfltbutton,
|
|
|
adcb8af |
! char_u *textfield)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
FARPROC dp;
|
|
|
adcb8af |
LPWORD p, pnumitems;
|
|
|
adcb8af |
--- 1098,1105 ----
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int dfltbutton,
|
|
|
adcb8af |
! char_u *textfield,
|
|
|
adcb8af |
! int ex_cmd)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
FARPROC dp;
|
|
|
adcb8af |
LPWORD p, pnumitems;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/gui_w32.c 2010-10-27 12:33:12.000000000 +0200
|
|
|
adcb8af |
--- src/gui_w32.c 2011-01-16 00:21:08.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 3005,3011 ****
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int dfltbutton,
|
|
|
adcb8af |
! char_u *textfield)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
WORD *p, *pdlgtemplate, *pnumitems;
|
|
|
adcb8af |
DWORD *dwp;
|
|
|
adcb8af |
--- 3005,3012 ----
|
|
|
adcb8af |
char_u *message,
|
|
|
adcb8af |
char_u *buttons,
|
|
|
adcb8af |
int dfltbutton,
|
|
|
adcb8af |
! char_u *textfield,
|
|
|
adcb8af |
! int ex_cmd)
|
|
|
adcb8af |
{
|
|
|
adcb8af |
WORD *p, *pdlgtemplate, *pnumitems;
|
|
|
adcb8af |
DWORD *dwp;
|
|
|
adcb8af |
*** ../vim-7.3.101/src/os_mswin.c 2010-12-17 20:23:56.000000000 +0100
|
|
|
adcb8af |
--- src/os_mswin.c 2011-01-16 00:21:41.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 593,599 ****
|
|
|
adcb8af |
gui.starting ? (char_u *)_("Message") :
|
|
|
adcb8af |
#endif
|
|
|
adcb8af |
(char_u *)_("Error"),
|
|
|
adcb8af |
! p, (char_u *)_("&Ok"), 1, NULL);
|
|
|
adcb8af |
break;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
ga_clear(&error_ga);
|
|
|
adcb8af |
--- 593,599 ----
|
|
|
adcb8af |
gui.starting ? (char_u *)_("Message") :
|
|
|
adcb8af |
#endif
|
|
|
adcb8af |
(char_u *)_("Error"),
|
|
|
adcb8af |
! p, (char_u *)_("&Ok"), 1, NULL, FALSE);
|
|
|
adcb8af |
break;
|
|
|
adcb8af |
}
|
|
|
adcb8af |
ga_clear(&error_ga);
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_athena.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_athena.pro 2011-01-16 00:23:00.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 27,31 ****
|
|
|
adcb8af |
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
|
|
|
adcb8af |
Window gui_x11_get_wid __ARGS((void));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
|
|
|
adcb8af |
/* vim: set ft=c : */
|
|
|
adcb8af |
--- 27,31 ----
|
|
|
adcb8af |
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
|
|
|
adcb8af |
Window gui_x11_get_wid __ARGS((void));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
|
|
|
adcb8af |
/* vim: set ft=c : */
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_gtk.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_gtk.pro 2011-01-16 00:22:57.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 13,19 ****
|
|
|
adcb8af |
void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
|
|
|
adcb8af |
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
|
|
|
adcb8af |
void gui_mch_find_dialog __ARGS((exarg_T *eap));
|
|
|
adcb8af |
--- 13,19 ----
|
|
|
adcb8af |
void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
|
|
|
adcb8af |
! 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));
|
|
|
adcb8af |
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
|
|
|
adcb8af |
void gui_mch_find_dialog __ARGS((exarg_T *eap));
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_mac.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_mac.pro 2011-01-16 00:31:46.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 81,87 ****
|
|
|
adcb8af |
int gui_mch_get_mouse_y __ARGS((void));
|
|
|
adcb8af |
void gui_mch_setmouse __ARGS((int x, int y));
|
|
|
adcb8af |
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
void gui_mch_set_foreground __ARGS((void));
|
|
|
adcb8af |
void gui_mch_show_tabline __ARGS((int showit));
|
|
|
adcb8af |
--- 81,87 ----
|
|
|
adcb8af |
int gui_mch_get_mouse_y __ARGS((void));
|
|
|
adcb8af |
void gui_mch_setmouse __ARGS((int x, int y));
|
|
|
adcb8af |
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
void gui_mch_set_foreground __ARGS((void));
|
|
|
adcb8af |
void gui_mch_show_tabline __ARGS((int showit));
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_motif.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_motif.pro 2011-01-16 00:22:58.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 29,35 ****
|
|
|
adcb8af |
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
|
|
|
adcb8af |
Window gui_x11_get_wid __ARGS((void));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield));
|
|
|
adcb8af |
void gui_mch_enable_footer __ARGS((int showit));
|
|
|
adcb8af |
void gui_mch_set_footer __ARGS((char_u *s));
|
|
|
adcb8af |
void gui_mch_show_toolbar __ARGS((int showit));
|
|
|
adcb8af |
--- 29,35 ----
|
|
|
adcb8af |
void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
|
|
|
adcb8af |
Window gui_x11_get_wid __ARGS((void));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
! 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));
|
|
|
adcb8af |
void gui_mch_enable_footer __ARGS((int showit));
|
|
|
adcb8af |
void gui_mch_set_footer __ARGS((char_u *s));
|
|
|
adcb8af |
void gui_mch_show_toolbar __ARGS((int showit));
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_photon.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_photon.pro 2011-01-16 00:32:33.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 8,14 ****
|
|
|
adcb8af |
void gui_mch_update __ARGS((void));
|
|
|
adcb8af |
int gui_mch_wait_for_chars __ARGS((int wtime));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield));
|
|
|
adcb8af |
int gui_mch_get_winpos __ARGS((int *x, int *y));
|
|
|
adcb8af |
void gui_mch_set_winpos __ARGS((int x, int y));
|
|
|
adcb8af |
void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
|
|
|
adcb8af |
--- 8,14 ----
|
|
|
adcb8af |
void gui_mch_update __ARGS((void));
|
|
|
adcb8af |
int gui_mch_wait_for_chars __ARGS((int wtime));
|
|
|
adcb8af |
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
|
|
|
adcb8af |
! 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));
|
|
|
adcb8af |
int gui_mch_get_winpos __ARGS((int *x, int *y));
|
|
|
adcb8af |
void gui_mch_set_winpos __ARGS((int x, int y));
|
|
|
adcb8af |
void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_w16.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_w16.pro 2011-01-16 00:34:36.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 74,79 ****
|
|
|
adcb8af |
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
|
|
|
adcb8af |
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
|
|
|
adcb8af |
void gui_mch_set_foreground __ARGS((void));
|
|
|
adcb8af |
/* vim: set ft=c : */
|
|
|
adcb8af |
--- 74,79 ----
|
|
|
adcb8af |
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
|
|
|
adcb8af |
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
|
|
|
adcb8af |
void gui_mch_set_foreground __ARGS((void));
|
|
|
adcb8af |
/* vim: set ft=c : */
|
|
|
adcb8af |
*** ../vim-7.3.101/src/proto/gui_w32.pro 2010-08-15 21:57:28.000000000 +0200
|
|
|
adcb8af |
--- src/proto/gui_w32.pro 2011-01-16 00:33:12.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 81,87 ****
|
|
|
adcb8af |
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
|
|
|
adcb8af |
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
|
|
|
adcb8af |
void gui_mch_set_foreground __ARGS((void));
|
|
|
adcb8af |
void gui_mch_drawsign __ARGS((int row, int col, int typenr));
|
|
|
adcb8af |
void *gui_mch_register_sign __ARGS((char_u *signfile));
|
|
|
adcb8af |
--- 81,87 ----
|
|
|
adcb8af |
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
|
|
|
adcb8af |
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
|
|
|
adcb8af |
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
|
|
|
adcb8af |
! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
|
|
|
adcb8af |
void gui_mch_set_foreground __ARGS((void));
|
|
|
adcb8af |
void gui_mch_drawsign __ARGS((int row, int col, int typenr));
|
|
|
adcb8af |
void *gui_mch_register_sign __ARGS((char_u *signfile));
|
|
|
adcb8af |
*** ../vim-7.3.101/src/version.c 2011-01-17 19:53:20.000000000 +0100
|
|
|
adcb8af |
--- src/version.c 2011-01-17 20:05:02.000000000 +0100
|
|
|
adcb8af |
***************
|
|
|
adcb8af |
*** 716,717 ****
|
|
|
adcb8af |
--- 716,719 ----
|
|
|
adcb8af |
{ /* Add new patch number below this line */
|
|
|
adcb8af |
+ /**/
|
|
|
adcb8af |
+ 102,
|
|
|
adcb8af |
/**/
|
|
|
adcb8af |
|
|
|
adcb8af |
--
|
|
|
adcb8af |
hundred-and-one symptoms of being an internet addict:
|
|
|
adcb8af |
110. You actually volunteer to become your employer's webmaster.
|
|
|
adcb8af |
|
|
|
adcb8af |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
adcb8af |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
adcb8af |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
adcb8af |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|