diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-08-08 14:33:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-08-08 14:33:21 +0200 |
| commit | 04b2751899886a18399286b92ef097ec8a74e911 (patch) | |
| tree | 5b1d52b0f9d813cfb8c449f6e6115c261b896403 | |
| parent | c271c48e8043ec388487b7489fb4692a154791d8 (diff) | |
| download | vim-git-04b2751899886a18399286b92ef097ec8a74e911.tar.gz | |
updated for version 7.3.624v7.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)
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 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( diff --git a/src/version.c b/src/version.c index 67ab5e726..c8889e49e 100644 --- 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, |