aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1633: some error messages are internal but do not use iemsg()

Browse Source 
Problem:    Some error messages are internal but do not use iemsg().
Solution:   Use iemsg(). (Dominique Pellé, closes #6894)
This commit is contained in:
Bram Moolenaar 2020-09-07 18:53:21 +02:00
parent 44d6652d56
commit e83cca2911
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/regexp.c
View File

@ -2279,7 +2279,7 @@ vim_regsub_both(
else if (*s == NUL) // we hit NUL. else if (*s == NUL) // we hit NUL.
{ {
if (copy) if (copy)
emsg(_(e_re_damg)); iemsg(_(e_re_damg));
goto exit; goto exit;
} }
else else

10
src/regexp_bt.c
View File

@ -2293,7 +2293,7 @@ bt_regcomp(char_u *expr, int re_flags)
int flags; int flags;
if (expr == NULL) if (expr == NULL)
EMSG_RET_NULL(_(e_null)); IEMSG_RET_NULL(_(e_null));
init_class_tab(); init_class_tab();
@ -2917,7 +2917,7 @@ do_class:
break; break;
default: // Oh dear. Called inappropriately. default: // Oh dear. Called inappropriately.
emsg(_(e_re_corr)); iemsg(_(e_re_corr));
#ifdef DEBUG #ifdef DEBUG
printf("Called regrepeat with op code %d\n", OP(p)); printf("Called regrepeat with op code %d\n", OP(p));
#endif #endif
@ -4099,7 +4099,7 @@ regmatch(
break; break;
default: default:
emsg(_(e_re_corr)); iemsg(_(e_re_corr));
#ifdef DEBUG #ifdef DEBUG
printf("Illegal op code %d\n", op); printf("Illegal op code %d\n", op);
#endif #endif
@ -4499,7 +4499,7 @@ regmatch(
{ {
// We get here only if there's trouble -- normally "case END" is // We get here only if there's trouble -- normally "case END" is
// the terminating point. // the terminating point.
emsg(_(e_re_corr)); iemsg(_(e_re_corr));
#ifdef DEBUG #ifdef DEBUG
printf("Premature EOL\n"); printf("Premature EOL\n");
#endif #endif
@ -4649,7 +4649,7 @@ bt_regexec_both(
// Be paranoid... // Be paranoid...
if (prog == NULL || line == NULL) if (prog == NULL || line == NULL)
{ {
emsg(_(e_null)); iemsg(_(e_null));
goto theend; goto theend;
} }

2
src/regexp_nfa.c
View File

@ -7147,7 +7147,7 @@ nfa_regexec_both(
// Be paranoid... // Be paranoid...
if (prog == NULL || line == NULL) if (prog == NULL || line == NULL)
{ {
emsg(_(e_null)); iemsg(_(e_null));
goto theend; goto theend;
} }

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1633,
/**/ /**/
1632, 1632,
/**/ /**/