From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 8 Aug 2012 12:33:21 +0000 (+0200)
Subject: updated for version 7.3.624
X-Git-Tag: v7.3.624
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04b2751899886a18399286b92ef097ec8a74e911;p=vim

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 b04f33034..98b2a3367 100644
--- 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 67ab5e726..c8889e49e 100644
--- 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,
 /**/