aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2018-01-01 23:11:31 -0500
committerJames McCoy <jamessan@jamessan.com>2018-01-02 19:35:22 -0500
commitb86e44aa358c2164bebddbb4ed9640b000323c6b (patch)
tree61b36745bad7a4480c8682e0604fb0701a979502 /src
parent09b9f9b7ce4c86a931d29fa1ba8f023a8571cbc4 (diff)
downloadrneovim-b86e44aa358c2164bebddbb4ed9640b000323c6b.tar.gz
rneovim-b86e44aa358c2164bebddbb4ed9640b000323c6b.tar.bz2
rneovim-b86e44aa358c2164bebddbb4ed9640b000323c6b.zip
vim-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. https://github.com/vim/vim/commit/de33011ec623fd562419dede6bf465b5b9881a20
Diffstat (limited to 'src')
-rw-r--r--src/nvim/if_cscope.c2
-rw-r--r--src/nvim/regexp_nfa.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 654b4630c5..303a9bd92b 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -1370,7 +1370,7 @@ static char *cs_manage_matches(char **matches, char **contexts,
cs_print_tags_priv(mp, cp, cnt);
break;
default: /* should not reach here */
- (void)EMSG(_("E570: fatal error in cs_manage_matches"));
+ IEMSG(_("E570: fatal error in cs_manage_matches"));
return NULL;
}
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 93ba9ce097..bc3ad57dde 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -1263,7 +1263,7 @@ static int nfa_regatom(void)
rc_did_emsg = TRUE;
return FAIL;
}
- EMSGN("INTERNAL: Unknown character class char: %" PRId64, c);
+ IEMSGN("INTERNAL: Unknown character class char: %" PRId64, c);
return FAIL;
}
/* When '.' is followed by a composing char ignore the dot, so that
@@ -4414,7 +4414,7 @@ static int 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;
@@ -5993,7 +5993,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
#ifdef REGEXP_DEBUG
if (c < 0)
- EMSGN("INTERNAL: Negative state char: %" PRId64, c);
+ IEMSGN("INTERNAL: Negative state char: %" PRId64, c);
#endif
result = (c == curc);
@@ -6464,9 +6464,9 @@ static regprog_T *nfa_regcomp(char_u *expr, int re_flags)
if (postfix == NULL) {
/* TODO: only give this error for debugging? */
if (post_ptr >= post_end)
- EMSGN("Internal error: estimated max number "
- "of states insufficient: %" PRId64,
- post_end - post_start);
+ IEMSGN("Internal error: estimated max number "
+ "of states insufficient: %" PRId64,
+ post_end - post_start);
goto fail; /* Cascaded (syntax?) error */
}