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)

diff --git a/src/eval.c b/src/eval.c
index b04f33034ae2cdc73be8e5cc89ef4ac6ddf6638c..98b2a3367a5bb56173a67b538e7edf7b51c4ff5d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -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(

diff --git a/src/version.c b/src/version.c
index 67ab5e726667fd135ce2880b96f465eceb4536cb..c8889e49e1ee0cf319f76ebf54ffa46bf9f989a6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    624,
 /**/
     623,
 /**/