0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

updated for version 7.3.624

Problem:    When cancelling input() it returns the third argument. That should
            only happen for inputdialog().
Solution:   Check if inputdialog() was used. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2012-08-08 14:33:21 +02:00
parent c271c48e80
commit 04b2751899
2 changed files with 3 additions and 1 deletions

View File

@@ -12966,7 +12966,7 @@ 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
if (inputdialog && 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(