From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 16 Jul 2012 17:27:29 +0000 (+0200)
Subject: updated for version 7.3.604
X-Git-Tag: v7.3.604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5c9cb555ef84d4db5f6feafd49b9ac079615968;p=thirdparty%2Fvim.git

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)
---

diff --git a/src/eval.c b/src/eval.c
index 99b3bba24a..f9db2f9ffe 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12940,6 +12940,7 @@ get_user_input(argvars, rettv, inputdialog)
 		int	xp_namelen;
 		long	argt;
 
+		/* input() with a third argument: completion */
 		rettv->vval.v_string = NULL;
 
 		xp_name = get_tv_string_buf_chk(&argvars[2], buf);
@@ -12958,6 +12959,11 @@ 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
+		&& argvars[1].v_type != VAR_UNKNOWN
+		&& argvars[2].v_type != VAR_UNKNOWN)
+	    rettv->vval.v_string = vim_strsave(get_tv_string_buf(
+							   &argvars[2], buf));
 
 	vim_free(xp_arg);
 
diff --git a/src/version.c b/src/version.c
index 6bf9708f34..80d8c75473 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 */
+/**/
+    604,
 /**/
     603,
 /**/