Skip to content

Commit e83cca2

Browse files
committed
patch 8.2.1633: some error messages are internal but do not use iemsg()
Problem: Some error messages are internal but do not use iemsg(). Solution: Use iemsg(). (Dominique Pellé, closes #6894)
1 parent 44d6652 commit e83cca2

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/regexp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2279,7 +2279,7 @@ vim_regsub_both(
22792279
else if (*s == NUL) // we hit NUL.
22802280
{
22812281
if (copy)
2282-
emsg(_(e_re_damg));
2282+
iemsg(_(e_re_damg));
22832283
goto exit;
22842284
}
22852285
else

src/regexp_bt.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,7 +2293,7 @@ bt_regcomp(char_u *expr, int re_flags)
22932293
int flags;
22942294

22952295
if (expr == NULL)
2296-
EMSG_RET_NULL(_(e_null));
2296+
IEMSG_RET_NULL(_(e_null));
22972297

22982298
init_class_tab();
22992299

@@ -2917,7 +2917,7 @@ regrepeat(
29172917
break;
29182918

29192919
default: // Oh dear. Called inappropriately.
2920-
emsg(_(e_re_corr));
2920+
iemsg(_(e_re_corr));
29212921
#ifdef DEBUG
29222922
printf("Called regrepeat with op code %d\n", OP(p));
29232923
#endif
@@ -4099,7 +4099,7 @@ regmatch(
40994099
break;
41004100

41014101
default:
4102-
emsg(_(e_re_corr));
4102+
iemsg(_(e_re_corr));
41034103
#ifdef DEBUG
41044104
printf("Illegal op code %d\n", op);
41054105
#endif
@@ -4499,7 +4499,7 @@ regmatch(
44994499
{
45004500
// We get here only if there's trouble -- normally "case END" is
45014501
// the terminating point.
4502-
emsg(_(e_re_corr));
4502+
iemsg(_(e_re_corr));
45034503
#ifdef DEBUG
45044504
printf("Premature EOL\n");
45054505
#endif
@@ -4649,7 +4649,7 @@ bt_regexec_both(
46494649
// Be paranoid...
46504650
if (prog == NULL || line == NULL)
46514651
{
4652-
emsg(_(e_null));
4652+
iemsg(_(e_null));
46534653
goto theend;
46544654
}
46554655

src/regexp_nfa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7147,7 +7147,7 @@ nfa_regexec_both(
71477147
// Be paranoid...
71487148
if (prog == NULL || line == NULL)
71497149
{
7150-
emsg(_(e_null));
7150+
iemsg(_(e_null));
71517151
goto theend;
71527152
}
71537153

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1633,
757759
/**/
758760
1632,
759761
/**/

0 commit comments

Comments
 (0)