thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3197: error messages are spread out

Browse Source 
Problem:    Error messages are spread out.
Solution:   Move a few more error messages to errors.h.
This commit is contained in:
Bram Moolenaar
2021-07-21 22:20:33 +02:00
parent 05bd9785fd
commit d8e44476d8
15 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/regexp_bt.c
View File

@@ -2158,7 +2158,7 @@ regpiece(int *flagp)
}
}
if (lop == END)
EMSG2_RET_NULL(_("E59: invalid character after %s@"),
EMSG2_RET_NULL(_(e_invalid_character_after_str_at),
reg_magic == MAGIC_ALL);
// Look behind must match with behind_pos.
if (lop == BEHIND || lop == NOBEHIND)
@@ -2199,7 +2199,7 @@ regpiece(int *flagp)
else
{
if (num_complex_braces >= 10)
EMSG2_RET_NULL(_("E60: Too many complex %s{...}s"),
EMSG2_RET_NULL(_(e_too_many_complex_str_curly),
reg_magic == MAGIC_ALL);
reginsert(BRACE_COMPLEX + num_complex_braces, ret);
regoptail(ret, regnode(BACK));
@@ -2369,7 +2369,7 @@ reg(
{
// Make a ZOPEN node.
if (regnzpar >= NSUBEXP)
EMSG_RET_NULL(_("E50: Too many \\z("));
EMSG_RET_NULL(_(e_too_many_z));
parno = regnzpar;
regnzpar++;
ret = regnode(ZOPEN + parno);
@@ -2380,7 +2380,7 @@ reg(
{
// Make a MOPEN node.
if (regnpar >= NSUBEXP)
EMSG2_RET_NULL(_("E51: Too many %s("), reg_magic == MAGIC_ALL);
EMSG2_RET_NULL(_(e_too_many_str_open), reg_magic == MAGIC_ALL);
parno = regnpar;
++regnpar;
ret = regnode(MOPEN + parno);
@@ -2437,18 +2437,18 @@ reg(
{
#ifdef FEAT_SYN_HL
if (paren == REG_ZPAREN)
EMSG_RET_NULL(_("E52: Unmatched \\z("));
EMSG_RET_NULL(_(e_unmatched_z));
else
#endif
if (paren == REG_NPAREN)
EMSG2_RET_NULL(_(e_unmatchedpp), reg_magic == MAGIC_ALL);
EMSG2_RET_NULL(_(e_unmatched_str_percent_open), reg_magic == MAGIC_ALL);
else
EMSG2_RET_NULL(_(e_unmatchedp), reg_magic == MAGIC_ALL);
EMSG2_RET_NULL(_(e_unmatched_str_open), reg_magic == MAGIC_ALL);
}
else if (paren == REG_NOPAREN && peekchr() != NUL)
{
if (curchr == Magic(')'))
EMSG2_RET_NULL(_(e_unmatchedpar), reg_magic == MAGIC_ALL);
EMSG2_RET_NULL(_(e_unmatched_str_close), reg_magic == MAGIC_ALL);
else
EMSG_RET_NULL(_(e_trailing)); // "Can't happen".
// NOTREACHED