diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-23 01:02:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-23 01:02:39 +0200 |
| commit | a9d37c928e109f8bb75faf24c5b4effb90b115ff (patch) | |
| tree | 71b81415cfcfcc82deb5d43a7301a7a12a315f52 /src/nvim/eval/encode.c | |
| parent | 77b6de0968172fec57412f92c19bb84d76d7dc77 (diff) | |
| parent | d463c9e03a79e981faaaa985b1160c292d08e172 (diff) | |
| download | rneovim-a9d37c928e109f8bb75faf24c5b4effb90b115ff.tar.gz rneovim-a9d37c928e109f8bb75faf24c5b4effb90b115ff.tar.bz2 rneovim-a9d37c928e109f8bb75faf24c5b4effb90b115ff.zip | |
Merge #6513 from ZyX-I/lazier-arg_errmsg-gettext
Diffstat (limited to 'src/nvim/eval/encode.c')
| -rw-r--r-- | src/nvim/eval/encode.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index e32f893faa..742497c1ca 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -182,9 +182,9 @@ static int conv_error(const char *const msg, const MPConvStack *const mpstack, } } } - EMSG3(msg, objname, (kv_size(*mpstack) == 0 - ? _("itself") - : (char *) msg_ga.ga_data)); + emsgf(msg, _(objname), (kv_size(*mpstack) == 0 + ? _("itself") + : (char *)msg_ga.ga_data)); ga_clear(&msg_ga); return FAIL; } @@ -793,7 +793,7 @@ char *encode_tv2string(typval_T *tv, size_t *len) garray_T ga; ga_init(&ga, (int)sizeof(char), 80); const int evs_ret = encode_vim_to_string(&ga, tv, - "encode_tv2string() argument"); + N_("encode_tv2string() argument")); (void)evs_ret; assert(evs_ret == OK); did_echo_string_emsg = false; @@ -821,7 +821,7 @@ char *encode_tv2echo(typval_T *tv, size_t *len) ga_concat(&ga, tv->vval.v_string); } } else { - const int eve_ret = encode_vim_to_echo(&ga, tv, ":echo argument"); + const int eve_ret = encode_vim_to_echo(&ga, tv, N_(":echo argument")); (void)eve_ret; assert(eve_ret == OK); } @@ -844,7 +844,8 @@ char *encode_tv2json(typval_T *tv, size_t *len) { garray_T ga; ga_init(&ga, (int)sizeof(char), 80); - const int evj_ret = encode_vim_to_json(&ga, tv, "encode_tv2json() argument"); + const int evj_ret = encode_vim_to_json(&ga, tv, + N_("encode_tv2json() argument")); if (!evj_ret) { ga_clear(&ga); } |