summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-08-08 14:33:21 +0200
committerBram Moolenaar <Bram@vim.org>2012-08-08 14:33:21 +0200
commit04b2751899886a18399286b92ef097ec8a74e911 (patch)
tree5b1d52b0f9d813cfb8c449f6e6115c261b896403 /src/eval.c
parentc271c48e8043ec388487b7489fb4692a154791d8 (diff)
downloadvim-04b2751899886a18399286b92ef097ec8a74e911.zip
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)
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c2
1 files changed, 1 insertions, 1 deletions
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(