Skip to content

Commit de33011

Browse files
committed
patch 8.0.0160: EMSG() is sometimes used where it should be IEMSG()
Problem: EMSG() is sometimes used for internal errors. Solution: Change them to IEMSG(). (Dominique Pelle) And a few more.
1 parent c695cec commit de33011

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/channel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial,
15671567
int dummy;
15681568

15691569
if (safe_to_invoke_callback == 0)
1570-
EMSG("INTERNAL: Invoking callback when it is not safe");
1570+
IEMSG("INTERNAL: Invoking callback when it is not safe");
15711571

15721572
argv[0].v_type = VAR_CHANNEL;
15731573
argv[0].vval.v_channel = channel;

src/eval.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ eval_init(void)
270270
p = &vimvars[i];
271271
if (STRLEN(p->vv_name) > 16)
272272
{
273-
EMSG("INTERNAL: name too long, increase size of dictitem16_T");
273+
IEMSG("INTERNAL: name too long, increase size of dictitem16_T");
274274
getout(1);
275275
}
276276
STRCPY(p->vv_di.di_key, p->vv_name);

src/regexp_nfa.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,7 +1359,7 @@ nfa_regatom(void)
13591359
rc_did_emsg = TRUE;
13601360
return FAIL;
13611361
}
1362-
EMSGN("INTERNAL: Unknown character class char: %ld", c);
1362+
IEMSGN("INTERNAL: Unknown character class char: %ld", c);
13631363
return FAIL;
13641364
}
13651365
#ifdef FEAT_MBYTE
@@ -4925,7 +4925,7 @@ check_char_class(int class, int c)
49254925

49264926
default:
49274927
/* should not be here :P */
4928-
EMSGN(_(e_ill_char_class), class);
4928+
IEMSGN(_(e_ill_char_class), class);
49294929
return FAIL;
49304930
}
49314931
return FAIL;
@@ -6688,7 +6688,7 @@ nfa_regmatch(
66886688

66896689
#ifdef DEBUG
66906690
if (c < 0)
6691-
EMSGN("INTERNAL: Negative state char: %ld", c);
6691+
IEMSGN("INTERNAL: Negative state char: %ld", c);
66926692
#endif
66936693
result = (c == curc);
66946694

@@ -7216,7 +7216,7 @@ nfa_regcomp(char_u *expr, int re_flags)
72167216
{
72177217
/* TODO: only give this error for debugging? */
72187218
if (post_ptr >= post_end)
7219-
EMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start);
7219+
IEMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start);
72207220
goto fail; /* Cascaded (syntax?) error */
72217221
}
72227222

src/version.c

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

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
160,
767769
/**/
768770
159,
769771
/**/

0 commit comments

Comments
 (0)