diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/helpers.lua | 6 | ||||
| -rw-r--r-- | test/unit/charset/vim_str2nr_spec.lua | 1 | ||||
| -rw-r--r-- | test/unit/viml/helpers.lua | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/test/helpers.lua b/test/helpers.lua index 16b9818f12..d24fae745b 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -301,10 +301,10 @@ local function mergedicts_copy(d1, d2) for k, v in pairs(d2) do if d2[k] == REMOVE_THIS then ret[k] = nil - elseif type(d1[k]) == 'table' and type(d2[k]) == 'table' then - ret[k] = mergedicts_copy(d1[k], d2[k]) + elseif type(d1[k]) == 'table' and type(v) == 'table' then + ret[k] = mergedicts_copy(d1[k], v) else - ret[k] = d2[k] + ret[k] = v end end return ret diff --git a/test/unit/charset/vim_str2nr_spec.lua b/test/unit/charset/vim_str2nr_spec.lua index 9309dc380c..22504649f6 100644 --- a/test/unit/charset/vim_str2nr_spec.lua +++ b/test/unit/charset/vim_str2nr_spec.lua @@ -5,7 +5,6 @@ local itp = helpers.gen_itp(it) local cimport = helpers.cimport local ffi = helpers.ffi -local eq = helpers.eq local shallowcopy = global_helpers.shallowcopy local updated = global_helpers.updated diff --git a/test/unit/viml/helpers.lua b/test/unit/viml/helpers.lua index aeb886a66f..9d2d7b61c7 100644 --- a/test/unit/viml/helpers.lua +++ b/test/unit/viml/helpers.lua @@ -112,7 +112,6 @@ return { pline2lua = pline2lua, pstate_str = pstate_str, new_pstate = new_pstate, - intchar2lua = intchar2lua, conv_cmp_type = conv_cmp_type, pstate_set_str = pstate_set_str, } |