diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2015-02-12 19:16:25 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-02-16 20:13:54 -0500 |
| commit | f4f0f646c33151baff90ac632791568364a9a62c (patch) | |
| tree | e4d4bb33444bbcf66a94b33bc2dbe939ce85b09f | |
| parent | f56d1dc838302c1cf0967724bf15a2136c37ef71 (diff) | |
| download | rneovim-f4f0f646c33151baff90ac632791568364a9a62c.tar.gz rneovim-f4f0f646c33151baff90ac632791568364a9a62c.tar.bz2 rneovim-f4f0f646c33151baff90ac632791568364a9a62c.zip | |
api: always return empty string as api type String
| -rw-r--r-- | src/nvim/api/private/helpers.c | 6 | ||||
| -rw-r--r-- | test/functional/shell/viml_system_spec.lua | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index 8083b819d8..39ca0756f3 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -644,10 +644,8 @@ static Object vim_to_object_rec(typval_T *obj, PMap(ptr_t) *lookup) switch (obj->v_type) { case VAR_STRING: - if (obj->vval.v_string != NULL) { - rv.type = kObjectTypeString; - rv.data.string = cstr_to_string((char *) obj->vval.v_string); - } + rv.type = kObjectTypeString; + rv.data.string = cstr_to_string((char *) obj->vval.v_string); break; case VAR_NUMBER: diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua index d24646e712..b35f070159 100644 --- a/test/functional/shell/viml_system_spec.lua +++ b/test/functional/shell/viml_system_spec.lua @@ -191,7 +191,7 @@ describe('system()', function() if xclip then describe("with a program that doesn't close stdout", function() it('will exit properly after passing input', function() - eq(nil, eval([[system('xclip -i -selection clipboard', 'clip-data')]])) + eq('', eval([[system('xclip -i -selection clipboard', 'clip-data')]])) eq('clip-data', eval([[system('xclip -o -selection clipboard')]])) end) end) |