summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 05378fdcd..310934ed7 100644
--- 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
index a953c099b..8e2115e5d 100644
--- 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,