diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-05 09:50:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-05 09:50:36 +0800 |
| commit | 9ded4c127599b821d0875db9d63049b5970437a4 (patch) | |
| tree | 04ab960fec3aaaf6d139164e27ee8c4c6ff8f900 /src/nvim/regexp.c | |
| parent | d79e72621226cae91c8d8f6ad23e3c0670e1211c (diff) | |
| parent | bdaaf2e8e113f8c32c70f83b60e0bf3f648357c1 (diff) | |
| download | rneovim-9ded4c127599b821d0875db9d63049b5970437a4.tar.gz rneovim-9ded4c127599b821d0875db9d63049b5970437a4.tar.bz2 rneovim-9ded4c127599b821d0875db9d63049b5970437a4.zip | |
Merge pull request #23483 from zeertzjq/vim-8.2.3135
vim-patch:8.2.{3135,4890,4892},9.0.0250: error message improvements
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index deb183f5c0..d08af2de6c 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -100,10 +100,20 @@ static int toggle_Magic(int x) return (semsg((m), (c) ? "" : "\\", (a)), rc_did_emsg = true, (void *)NULL) #define EMSG2_RET_FAIL(m, c) \ return (semsg((m), (c) ? "" : "\\"), rc_did_emsg = true, FAIL) -#define EMSG_ONE_RET_NULL EMSG2_RET_NULL(_("E369: invalid item in %s%%[]"), reg_magic == MAGIC_ALL) +#define EMSG_ONE_RET_NULL EMSG2_RET_NULL(_(e_invalid_item_in_str_brackets), reg_magic == MAGIC_ALL) #define MAX_LIMIT (32767L << 16L) +static const char e_invalid_character_after_str_at[] + = N_("E59: Invalid character after %s@"); +static const char e_invalid_use_of_underscore[] + = N_("E63: Invalid use of \\_"); +static const char e_pattern_uses_more_memory_than_maxmempattern[] + = N_("E363: Pattern uses more memory than 'maxmempattern'"); +static const char e_invalid_item_in_str_brackets[] + = N_("E369: Invalid item in %s%%[]"); +static const char e_missing_delimiter_after_search_pattern_str[] + = N_("E654: Missing delimiter after search pattern: %s"); static const char e_missingbracket[] = N_("E769: Missing ] after %s["); static const char e_reverse_range[] = N_("E944: Reverse range in character class"); static const char e_large_class[] = N_("E945: Range too large in character class"); @@ -491,7 +501,7 @@ char *skip_regexp_err(char *startp, int delim, int magic) char *p = skip_regexp(startp, delim, magic); if (*p != delim) { - semsg(_("E654: missing delimiter after search pattern: %s"), startp); + semsg(_(e_missing_delimiter_after_search_pattern_str), startp); return NULL; } return p; |