diff options
author | James McCoy <jamessan@jamessan.com> | 2016-11-16 06:52:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-16 06:52:19 -0500 |
commit | 108d54bbd455635fc29541eb4bae4b9f3318aafb (patch) | |
tree | d5d829f41de3c7d151f62910f00c81bad873e47b /src/nvim/eval/encode.c | |
parent | c66ca17ca1a2f396252bc554198f9e73c7073385 (diff) | |
parent | 34317846d6fa9c2d3b23742abc455eafca0e92e4 (diff) | |
download | rneovim-108d54bbd455635fc29541eb4bae4b9f3318aafb.tar.gz rneovim-108d54bbd455635fc29541eb4bae4b9f3318aafb.tar.bz2 rneovim-108d54bbd455635fc29541eb4bae4b9f3318aafb.zip |
Merge pull request #5600 from jamessan/vim-7.4.1640
vim-patch:7.4.1640,7.4.1647,7.4.1650,7.4.1664
Diffstat (limited to 'src/nvim/eval/encode.c')
-rw-r--r-- | src/nvim/eval/encode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index 670437ceda..f6c58d8562 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -836,7 +836,7 @@ char *encode_tv2json(typval_T *tv, size_t *len) msgpack_pack_double(packer, (double) (flt)) #define TYPVAL_ENCODE_CONV_FUNC(fun) \ - return conv_error(_("E951: Error while dumping %s, %s: " \ + return conv_error(_("E5004: Error while dumping %s, %s: " \ "attempt to dump function reference"), \ mpstack, objname) @@ -880,7 +880,7 @@ char *encode_tv2json(typval_T *tv, size_t *len) #define TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS() #define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type) \ - return conv_error(_("E952: Unable to dump %s: " \ + return conv_error(_("E5005: Unable to dump %s: " \ "container references itself in %s"), \ mpstack, objname) |