aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-11-12 13:52:50 -0500
committerJames McCoy <jamessan@jamessan.com>2016-11-15 23:16:08 -0500
commitc0fd830be4ef3eafb756c463aee6408323ba4e58 (patch)
treeca1026ad66df95cbaf8ba39d434bff1b91a14e4e /src
parent7231438f124eff0ce0b9a8998ac7838abc094a8b (diff)
downloadrneovim-c0fd830be4ef3eafb756c463aee6408323ba4e58.tar.gz
rneovim-c0fd830be4ef3eafb756c463aee6408323ba4e58.tar.bz2
rneovim-c0fd830be4ef3eafb756c463aee6408323ba4e58.zip
Bump all nvim-specific error codes above E5000
In order to not conflict with new error codes that Vim adds, all Neovim error codes should be above 5000. The three existing sub-5000 error codes (E926, E951, and E952) are now E50003, E5004, and E5005 respectively. E953 was removed in 6167ce6df2753d5474ad49aea19f5957128ab015, so just remove it from the help.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval/encode.c4
-rw-r--r--src/nvim/undo.c2
2 files changed, 3 insertions, 3 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)
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index d6428d63f7..4d56046bc1 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -691,7 +691,7 @@ char *u_get_undo_file_name(const char *const buf_ffname, const bool reading)
int ret;
char *failed_dir;
if ((ret = os_mkdir_recurse(dir_name, 0755, &failed_dir)) != 0) {
- EMSG3(_("E926: Unable to create directory \"%s\" for undo file: %s"),
+ EMSG3(_("E5003: Unable to create directory \"%s\" for undo file: %s"),
failed_dir, os_strerror(ret));
xfree(failed_dir);
} else {