diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-12-05 03:33:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 03:33:01 +0100 |
| commit | aec81f44d1f3b9209a638c3e7b6dfd74eed4ca6e (patch) | |
| tree | 79b82f057b2fd1fb49f1cab715735f62f7dbf5f8 /src | |
| parent | 67848c0b916cc1b130bac975017f8e0c762ddc4c (diff) | |
| parent | d763d2fe7aae1c531c72c1d542cad2b19719929b (diff) | |
| download | rneovim-aec81f44d1f3b9209a638c3e7b6dfd74eed4ca6e.tar.gz rneovim-aec81f44d1f3b9209a638c3e7b6dfd74eed4ca6e.tar.bz2 rneovim-aec81f44d1f3b9209a638c3e7b6dfd74eed4ca6e.zip | |
Merge #7477 from FlorianGit/empty-lists-dicts-strings
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 577aa67c60..56aedb1b4e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -8457,11 +8457,13 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map) int idx = 0; if (argvars[0].v_type == VAR_LIST) { + tv_copy(&argvars[0], rettv); if ((l = argvars[0].vval.v_list) == NULL || (!map && tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE))) { return; } } else if (argvars[0].v_type == VAR_DICT) { + tv_copy(&argvars[0], rettv); if ((d = argvars[0].vval.v_dict) == NULL || (!map && tv_check_lock(d->dv_lock, arg_errmsg, TV_TRANSLATE))) { return; @@ -8542,8 +8544,6 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map) did_emsg |= save_did_emsg; } - - tv_copy(&argvars[0], rettv); } static int filter_map_one(typval_T *tv, typval_T *expr, int map, int *remp) |