Skip to content
Snippets Groups Projects
Commit b5c9cb55 authored by Bram Moolenaar's avatar Bram Moolenaar
Browse files

updated for version 7.3.604

Problem:    inputdialog() doesn't use the cancel argument in the console.
            (David Fishburn)
Solution:   Use the third argument. (Christian Brabant)
parent bdb62056
No related merge requests found
......@@ -12940,6 +12940,7 @@ get_user_input(argvars, rettv, inputdialog)
int xp_namelen;
long argt;
 
/* input() with a third argument: completion */
rettv->vval.v_string = NULL;
 
xp_name = get_tv_string_buf_chk(&argvars[2], buf);
......@@ -12958,6 +12959,11 @@ get_user_input(argvars, rettv, inputdialog)
rettv->vval.v_string =
getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
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);
 
......
......@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
604,
/**/
603,
/**/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment