thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.624

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@@ -12966,7 +12966,7 @@ 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 if (inputdialog && rettv->vval.v_string == NULL
&& argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_UNKNOWN
&& argvars[2].v_type != VAR_UNKNOWN) && argvars[2].v_type != VAR_UNKNOWN)
rettv->vval.v_string = vim_strsave(get_tv_string_buf( rettv->vval.v_string = vim_strsave(get_tv_string_buf(

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 */
/**/
624,
/**/ /**/
623, 623,
/**/ /**/