# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1566053103 -7200
# Node ID b27d06bd0fdebbed9c4a1223e9e743bac1da00d2
# Parent  314eb6b02037a8057bb3cd618cac3ec236ca9761
patch 8.1.1872: when Vim exits because of a signal, VimLeave is not triggered

commit https://github.com/vim/vim/commit/c7226684c82dde7eb6601e067ee2e9387e447903
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Aug 17 16:33:23 2019 +0200

    patch 8.1.1872: when Vim exits because of a signal, VimLeave is not triggered

    Problem:    When Vim exits because of a signal, VimLeave is not triggered.
                (Daniel Hahler)
    Solution:   Unblock autocommands when triggering VimLeave. (closes #4818)

diff --git a/src/main.c b/src/main.c
--- a/src/main.c
+++ b/src/main.c
@@ -541,12 +541,12 @@ vim_main2(void)
 #ifdef FEAT_GUI
     if (gui.starting)
     {
-#if defined(UNIX) || defined(VMS)
+# if defined(UNIX) || defined(VMS)
 	/* When something caused a message from a vimrc script, need to output
 	 * an extra newline before the shell prompt. */
 	if (did_emsg || msg_didout)
 	    putchar('\n');
-#endif
+# endif
 
 	gui_start(NULL);		/* will set full_screen to TRUE */
 	TIME_MSG("starting GUI");
@@ -1485,7 +1485,19 @@ getout(int exitval)
 #endif
 
     if (v_dying <= 1)
+    {
+	int	unblock = 0;
+
+	// deathtrap() blocks autocommands, but we do want to trigger VimLeave.
+	if (is_autocmd_blocked())
+	{
+	    unblock_autocmds();
+	    ++unblock;
+	}
 	apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, FALSE, curbuf);
+	if (unblock)
+	    block_autocmds();
+    }
 
 #ifdef FEAT_PROFILE
     profile_dump();
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1872,
+/**/
     1871,
 /**/
     1870,