summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-19 13:17:21 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-19 13:17:21 +0100
commit213e70e284b0975dd34525e94e59e26811097c72 (patch)
tree7a1549b72ef113af45f037b24db4e16cbbd4d43e
parent9e043181ad51536f23d069e719d6f6b96c4c0ec0 (diff)
downloadvim-git-213e70e284b0975dd34525e94e59e26811097c72.tar.gz
patch 9.0.0227: cannot read error message when abort() is calledv9.0.0227
Problem: Cannot read error message when abort() is called. Solution: Output a newline before calling abort().
-rw-r--r--src/message.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c
index ec128bd42..11662ba6a 100644
--- a/src/message.c
+++ b/src/message.c
@@ -831,6 +831,8 @@ iemsg(char *s)
emsg_core((char_u *)s);
#if defined(ABORT_ON_INTERNAL_ERROR) && defined(FEAT_EVAL)
set_vim_var_string(VV_ERRMSG, (char_u *)s, -1);
+ msg_putchar('\n'); // avoid overwriting the error message
+ out_flush();
abort();
#endif
}
@@ -863,10 +865,12 @@ siemsg(const char *s, ...)
va_end(ap);
emsg_core(IObuff);
}
- }
# ifdef ABORT_ON_INTERNAL_ERROR
- abort();
+ msg_putchar('\n'); // avoid overwriting the error message
+ out_flush();
+ abort();
# endif
+ }
}
#endif
diff --git a/src/version.c b/src/version.c
index bbe7a2e8c..5d69c638d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -732,6 +732,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 227,
+/**/
226,
/**/
225,