Skip to content

Commit 3b7e81b

Browse files
committed
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)
1 parent 4db8b59 commit 3b7e81b

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/eval.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12940,6 +12940,7 @@ get_user_input(argvars, rettv, inputdialog)
1294012940
int xp_namelen;
1294112941
long argt;
1294212942

12943+
/* input() with a third argument: completion */
1294312944
rettv->vval.v_string = NULL;
1294412945

1294512946
xp_name = get_tv_string_buf_chk(&argvars[2], buf);
@@ -12958,6 +12959,11 @@ get_user_input(argvars, rettv, inputdialog)
1295812959
rettv->vval.v_string =
1295912960
getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
1296012961
xp_type, xp_arg);
12962+
if (rettv->vval.v_string == NULL
12963+
&& argvars[1].v_type != VAR_UNKNOWN
12964+
&& argvars[2].v_type != VAR_UNKNOWN)
12965+
rettv->vval.v_string = vim_strsave(get_tv_string_buf(
12966+
&argvars[2], buf));
1296112967

1296212968
vim_free(xp_arg);
1296312969

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
604,
717719
/**/
718720
603,
719721
/**/

0 commit comments

Comments
 (0)