diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-08 20:50:52 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-08 20:50:52 +0100 |
| commit | de33011ec623fd562419dede6bf465b5b9881a20 (patch) | |
| tree | 0ae82bcbe54c907d4893f36c94ed43624aea351d | |
| parent | c695cec4698b41d7b9555efdd47dda9b1945d3ae (diff) | |
patch 8.0.0160: EMSG() is sometimes used where it should be IEMSG()v8.0.0160
Problem: EMSG() is sometimes used for internal errors.
Solution: Change them to IEMSG(). (Dominique Pelle) And a few more.
| -rw-r--r-- | src/channel.c | 2 | ||||
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/channel.c b/src/channel.c index 32f3527f79..f409e1d209 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1567,7 +1567,7 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial, int dummy; if (safe_to_invoke_callback == 0) - EMSG("INTERNAL: Invoking callback when it is not safe"); + IEMSG("INTERNAL: Invoking callback when it is not safe"); argv[0].v_type = VAR_CHANNEL; argv[0].vval.v_channel = channel; diff --git a/src/eval.c b/src/eval.c index 70fbc8863b..11fc035fb4 100644 --- a/src/eval.c +++ b/src/eval.c @@ -270,7 +270,7 @@ eval_init(void) p = &vimvars[i]; if (STRLEN(p->vv_name) > 16) { - EMSG("INTERNAL: name too long, increase size of dictitem16_T"); + IEMSG("INTERNAL: name too long, increase size of dictitem16_T"); getout(1); } STRCPY(p->vv_di.di_key, p->vv_name); diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index fcca818288..919dadcb0c 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1359,7 +1359,7 @@ nfa_regatom(void) rc_did_emsg = TRUE; return FAIL; } - EMSGN("INTERNAL: Unknown character class char: %ld", c); + IEMSGN("INTERNAL: Unknown character class char: %ld", c); return FAIL; } #ifdef FEAT_MBYTE @@ -4925,7 +4925,7 @@ check_char_class(int class, int c) default: /* should not be here :P */ - EMSGN(_(e_ill_char_class), class); + IEMSGN(_(e_ill_char_class), class); return FAIL; } return FAIL; @@ -6688,7 +6688,7 @@ nfa_regmatch( #ifdef DEBUG if (c < 0) - EMSGN("INTERNAL: Negative state char: %ld", c); + IEMSGN("INTERNAL: Negative state char: %ld", c); #endif result = (c == curc); @@ -7216,7 +7216,7 @@ nfa_regcomp(char_u *expr, int re_flags) { /* TODO: only give this error for debugging? */ if (post_ptr >= post_end) - EMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start); + IEMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start); goto fail; /* Cascaded (syntax?) error */ } diff --git a/src/version.c b/src/version.c index f1a36da0ce..641c72c40f 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 160, +/**/ 159, /**/ 158, |