diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-01-23 15:32:11 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2017-01-23 15:49:37 +0100 |
commit | 73da522d73c5d686c122ea4482d03e576a6a242c (patch) | |
tree | c1964417c81554ddb1ba212aec74ac532eb0d56d | |
parent | 7c7c5a80a46b38067e8288e1e3ccd2b9c7c73b6e (diff) | |
download | rneovim-73da522d73c5d686c122ea4482d03e576a6a242c.tar.gz rneovim-73da522d73c5d686c122ea4482d03e576a6a242c.tar.bz2 rneovim-73da522d73c5d686c122ea4482d03e576a6a242c.zip |
errors: Introduce "E856: Filename too long"
-rw-r--r-- | runtime/doc/helphelp.txt | 2 | ||||
-rw-r--r-- | src/nvim/ex_cmds.c | 8 | ||||
-rw-r--r-- | src/nvim/file_search.c | 2 | ||||
-rw-r--r-- | src/nvim/globals.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index ca341af200..ad1611133a 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -185,7 +185,7 @@ command: > < *:helpt* *:helptags* - *E154* *E150* *E151* *E152* *E153* *E670* + *E154* *E150* *E151* *E152* *E153* *E670* *E856* :helpt[ags] [++t] {dir} Generate the help tags file(s) for directory {dir}. When {dir} is ALL then all "doc" directories in diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 3a551975f3..19d8acd75a 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -4816,7 +4816,7 @@ void fix_help_buffer(void) if (!add_pathsep((char *)NameBuff) || STRLCAT(NameBuff, "doc/*.??[tx]", sizeof(NameBuff)) >= MAXPATHL) { - EMSG(_(e_pathtoolong)); + EMSG(_(e_fnametoolong)); continue; } @@ -4984,7 +4984,7 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname, if (dirlen >= MAXPATHL || STRLCAT(NameBuff, "/**/*", sizeof(NameBuff)) >= MAXPATHL // NOLINT || STRLCAT(NameBuff, ext, sizeof(NameBuff)) >= MAXPATHL) { - EMSG(_(e_pathtoolong)); + EMSG(_(e_fnametoolong)); return; } @@ -5006,7 +5006,7 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname, memcpy(NameBuff, dir, dirlen + 1); if (!add_pathsep((char *)NameBuff) || STRLCAT(NameBuff, tagfname, sizeof(NameBuff)) >= MAXPATHL) { - EMSG(_(e_pathtoolong)); + EMSG(_(e_fnametoolong)); return; } fd_tags = mch_fopen((char *)NameBuff, "w"); @@ -5184,7 +5184,7 @@ static void do_helptags(char_u *dirname, bool add_help_tags) STRLCPY(NameBuff, dirname, sizeof(NameBuff)); if (!add_pathsep((char *)NameBuff) || STRLCAT(NameBuff, "**", sizeof(NameBuff)) >= MAXPATHL) { - EMSG(_(e_pathtoolong)); + EMSG(_(e_fnametoolong)); xfree(dirname); return; } diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 122cea7466..73faac0a43 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -191,6 +191,8 @@ typedef struct ff_search_ctx_T { # include "file_search.c.generated.h" #endif +static char_u e_pathtoolong[] = N_("E854: path too long for completion"); + /* * Initialization routine for vim_findfile(). * diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 2c6c0025dd..baa85c01f8 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1215,7 +1215,7 @@ EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name")); EXTERN char_u e_dirnotf[] INIT(= N_( "E919: Directory not found in '%s': \"%s\"")); EXTERN char_u e_unsupportedoption[] INIT(= N_("E519: Option not supported")); -EXTERN char_u e_pathtoolong[] INIT(= N_("E854: path too long for completion")); +EXTERN char_u e_fnametoolong[] INIT(= N_("E856: Filename too long")); EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM")); |