aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.604

Browse Source 
Problem:    inputdialog() doesn't use the cancel argument in the console.
            (David Fishburn)
Solution:   Use the third argument. (Christian Brabant)
This commit is contained in:
Bram Moolenaar 2012-07-16 19:27:29 +02:00
parent bdb620560b
commit b5c9cb555e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eval.c
View File

@ -12940,6 +12940,7 @@ get_user_input(argvars, rettv, inputdialog)
int xp_namelen; int xp_namelen;
long argt; long argt;
/* input() with a third argument: completion */
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;
xp_name = get_tv_string_buf_chk(&argvars[2], buf); xp_name = get_tv_string_buf_chk(&argvars[2], buf);
@ -12958,6 +12959,11 @@ get_user_input(argvars, rettv, inputdialog)
rettv->vval.v_string = rettv->vval.v_string =
getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr, getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
xp_type, xp_arg); xp_type, xp_arg);
if (rettv->vval.v_string == NULL
&& argvars[1].v_type != VAR_UNKNOWN
&& argvars[2].v_type != VAR_UNKNOWN)
rettv->vval.v_string = vim_strsave(get_tv_string_buf(
&argvars[2], buf));
vim_free(xp_arg); vim_free(xp_arg);

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
604,
/**/ /**/
603, 603,
/**/ /**/