aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_eval.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-12-15 19:10:25 -0500
committerGitHub <noreply@github.com>2017-12-15 19:10:25 -0500
commit7afd26a6d189d1ca798f93db8661bd656a37265f (patch)
tree1c2aa0dbd479f322fa6d8221b9f141fc6e2d3a44 /src/nvim/ex_eval.c
parent6ff13d78b7eb0a1fae2e2e8cdd054072e1467158 (diff)
parentdcb2780b834d4df006f55a0475e03bd2a38ac344 (diff)
downloadrneovim-7afd26a6d189d1ca798f93db8661bd656a37265f.tar.gz
rneovim-7afd26a6d189d1ca798f93db8661bd656a37265f.tar.bz2
rneovim-7afd26a6d189d1ca798f93db8661bd656a37265f.zip
Merge pull request #7306 from DarkDeepBlue/vim-8.0.0074
vim-patch:8.0.0074
Diffstat (limited to 'src/nvim/ex_eval.c')
-rw-r--r--src/nvim/ex_eval.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 9037b3c151..4010a088c8 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -517,7 +517,7 @@ static void discard_exception(except_T *excp, int was_finished)
char_u *saved_IObuff;
if (excp == NULL) {
- EMSG(_(e_internal));
+ internal_error("discard_exception()");
return;
}
@@ -619,8 +619,9 @@ static void catch_exception(except_T *excp)
*/
static void finish_exception(except_T *excp)
{
- if (excp != caught_stack)
- EMSG(_(e_internal));
+ if (excp != caught_stack) {
+ internal_error("finish_exception()");
+ }
caught_stack = caught_stack->caught;
if (caught_stack != NULL) {
set_vim_var_string(VV_EXCEPTION, (char *) caught_stack->value, -1);
@@ -1422,8 +1423,9 @@ void ex_catch(exarg_T *eap)
* ":endtry" or when the catch clause is left by a ":continue",
* ":break", ":return", ":finish", error, interrupt, or another
* exception. */
- if (cstack->cs_exception[cstack->cs_idx] != current_exception)
- EMSG(_(e_internal));
+ if (cstack->cs_exception[cstack->cs_idx] != current_exception) {
+ internal_error("ex_catch()");
+ }
} else {
/*
* If there is a preceding catch clause and it caught the exception,
@@ -1547,7 +1549,7 @@ void ex_finally(exarg_T *eap)
* exception will be discarded. */
if (did_throw && cstack->cs_exception[cstack->cs_idx]
!= current_exception)
- EMSG(_(e_internal));
+ internal_error("ex_finally()");
}
/*