neovim

commit 7ff283b1b754e01280d82ff63aa37601ab4e1006
parent 2af9be3db59b2e26268dc62cb65e673e2f7d4783
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri, 19 Aug 2022 21:02:38 +0800

Merge pull request #19843 from zeertzjq/vim-9.0.0227

vim-patch:8.2.3946,9.0.0227: internal error improvements
Diffstat:
M
src/nvim/message.c
 | 
13
+++++++++++++
M
src/nvim/testdir/runtest.vim
 | 
1
+

2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/nvim/message.c b/src/nvim/message.c
@@ -830,8 +830,15 @@ static bool semsgv(const char *fmt, va_list ap)
 /// detected when fuzzing vim.
 void iemsg(const char *s)
 {
+  if (emsg_not_now()) {
+    return;
+  }
+
   emsg(s);
 #ifdef ABORT_ON_INTERNAL_ERROR
+  set_vim_var_string(VV_ERRMSG, s, -1);
+  msg_putchar('\n');  // avoid overwriting the error message
+  ui_flush();
   abort();
 #endif
 }
@@ -841,11 +848,17 @@ void iemsg(const char *s)
 /// detected when fuzzing vim.
 void siemsg(const char *s, ...)
 {
+  if (emsg_not_now()) {
+    return;
+  }
+
   va_list ap;
   va_start(ap, s);
   (void)semsgv(s, ap);
   va_end(ap);
 #ifdef ABORT_ON_INTERNAL_ERROR
+  msg_putchar('\n');  // avoid overwriting the error message
+  ui_flush();
   abort();
 #endif
 }
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
@@ -257,6 +257,7 @@ endfunc
 func EarlyExit(test)
   " It's OK for the test we use to test the quit detection.
   if a:test != 'Test_zz_quit_detected()'
+    call add(v:errors, v:errmsg)
     call add(v:errors, 'Test caused Vim to exit: ' . a:test)
   endif