Mercurial > vim

changeset 3730:06749e351b1c v7.3.624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 08 Aug 2012 14:33:21 +0200
parents 4b6470981ca4
children 84ab759a9e38
files src/eval.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -12966,7 +12966,7 @@ get_user_input(argvars, rettv, inputdial
 	    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(
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    624,
+/**/
     623,
 /**/
     622,