diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2023-12-07 05:57:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 05:57:31 -0800 |
| commit | e42f03264b424450b560a69994879f09b6c555d8 (patch) | |
| tree | 4d18136e38aaa7e0afed05e8e7a6b3a754e39089 /src/nvim/eval/funcs.c | |
| parent | 5fa88a7ae13effc02d42070313d3082bf98e22a7 (diff) | |
| parent | a16218d4c6773c474011149661470af6e8c90892 (diff) | |
| download | rneovim-e42f03264b424450b560a69994879f09b6c555d8.tar.gz rneovim-e42f03264b424450b560a69994879f09b6c555d8.tar.bz2 rneovim-e42f03264b424450b560a69994879f09b6c555d8.zip | |
Merge #26426 allow empty string key in msgpack => Vim conversion
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 4029478072..c1c865df60 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -355,10 +355,7 @@ static void api_wrapper(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) goto end; } - if (!object_to_vim(result, rettv, &err)) { - assert(ERROR_SET(&err)); - semsg(_("Error converting the call result: %s"), err.msg); - } + object_to_vim(result, rettv, &err); end: api_free_array(args); @@ -428,7 +425,7 @@ static void f_and(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) static void f_api_info(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) { Dictionary metadata = api_metadata(); - (void)object_to_vim(DICTIONARY_OBJ(metadata), rettv, NULL); + object_to_vim(DICTIONARY_OBJ(metadata), rettv, NULL); } /// "atan2()" function @@ -1023,7 +1020,7 @@ static void f_ctxget(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) Dictionary ctx_dict = ctx_to_dict(ctx); Error err = ERROR_INIT; - (void)object_to_vim(DICTIONARY_OBJ(ctx_dict), rettv, &err); + object_to_vim(DICTIONARY_OBJ(ctx_dict), rettv, &err); api_free_dictionary(ctx_dict); api_clear_error(&err); } @@ -6751,10 +6748,7 @@ static void f_rpcrequest(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) goto end; } - if (!object_to_vim(result, rettv, &err)) { - assert(ERROR_SET(&err)); - semsg(_("Error converting the call result: %s"), err.msg); - } + object_to_vim(result, rettv, &err); end: arena_mem_free(res_mem); |