Mercurial > vim

changeset 26835:d9ced5bca6d6 v8.2.3946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3946: when an internal error makes Vim exit the error is not seen Commit: https://github.com/vim/vim/commit/1c67f3a9779b99bed7aacb3108abbb649445d3ed Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 30 13:32:09 2021 +0000 patch 8.2.3946: when an internal error makes Vim exit the error is not seen Problem: When an internal error makes Vim exit the error is not seen. Solution: Add the error to the test output.
author Bram Moolenaar <Bram@vim.org>
date Thu, 30 Dec 2021 14:45:03 +0100
parents 7b4e075fe5f1
children bf3405e535fb
files src/message.c src/testdir/runtest.vim src/version.c
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/message.c
+++ b/src/message.c
@@ -824,10 +824,13 @@ semsg(const char *s, ...)
 iemsg(char *s)
 {
     if (!emsg_not_now())
+    {
 	emsg_core((char_u *)s);
 #ifdef ABORT_ON_INTERNAL_ERROR
-    abort();
+	set_vim_var_string(VV_ERRMSG, (char_u *)s, -1);
+	abort();
 #endif
+    }
 }
 
 #ifndef PROTO  // manual proto with __attribute__
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -304,6 +304,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
 
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3946,
+/**/
     3945,
 /**/
     3944,