# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1602335704 -7200
# Node ID 1722ed01c7291aa5c58ed3b84e8ee35acb79558c
# Parent  11d166f7a958cc52b5eb2aec09eb6f6b36b6e175
patch 8.2.1820: Vim9: crash when error happens in timer callback

Commit: https://github.com/vim/vim/commit/820d55a50bbc8c0ad0505b7e4302a734896b6bab
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Oct 10 15:05:23 2020 +0200

    patch 8.2.1820: Vim9: crash when error happens in timer callback

    Problem:    Vim9: crash when error happens in timer callback.
    Solution:   Check that current_exception is not NULL. (closes https://github.com/vim/vim/issues/7100)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1234,6 +1234,10 @@ do_cmdline(
 
     if (trylevel == 0)
     {
+	// Just in case did_throw got set but current_exception wasn't.
+	if (current_exception == NULL)
+	    did_throw = FALSE;
+
 	/*
 	 * When an exception is being thrown out of the outermost try
 	 * conditional, discard the uncaught exception, disable the conversion
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1820,
+/**/
     1819,
 /**/
     1818,