diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-13 18:40:54 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-13 18:40:54 +0000 |
| commit | 037cc64f8f46d5f2e4441e14850ea91efa2b9c63 (patch) | |
| tree | 54d069da201d1120d45426b4472d1b3e1e9d7f58 /src | |
| parent | 61abfd1171924eddc619a9bb13dfea788a16ac2e (diff) | |
| download | vim-git-037cc64f8f46d5f2e4441e14850ea91efa2b9c63.tar.gz | |
updated for version 7.1-105v7.1.105
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c index 69f3af8ce..5d4c720b0 100644 --- a/src/eval.c +++ b/src/eval.c @@ -6746,20 +6746,24 @@ get_dict_tv(arg, rettv, evaluate) clear_tv(&tvkey); goto failret; } - key = get_tv_string_buf_chk(&tvkey, buf); - if (key == NULL || *key == NUL) + if (evaluate) { - /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */ - if (key != NULL) - EMSG(_(e_emptykey)); - clear_tv(&tvkey); - goto failret; + key = get_tv_string_buf_chk(&tvkey, buf); + if (key == NULL || *key == NUL) + { + /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */ + if (key != NULL) + EMSG(_(e_emptykey)); + clear_tv(&tvkey); + goto failret; + } } *arg = skipwhite(*arg + 1); if (eval1(arg, &tv, evaluate) == FAIL) /* recursive! */ { - clear_tv(&tvkey); + if (evaluate) + clear_tv(&tvkey); goto failret; } if (evaluate) diff --git a/src/version.c b/src/version.c index b43dcc761..90bc0490d 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 105, +/**/ 104, /**/ 103, |