diff --git a/src/ex_getln.c b/src/ex_getln.c
index 2678184bca..d000112e62 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -342,6 +342,13 @@ getcmdline(firstc, count, indent)
     do_digraph(-1);		/* init digraph typeahead */
 #endif
 
+    /* If something above caused an error, reset the flags, we do want to type
+     * and execute commands. Display may be messed up a bit. */
+    if (did_emsg)
+	redrawcmd();
+    did_emsg = FALSE;
+    got_int = FALSE;
+
     /*
      * Collect the command string, handling editing keys.
      */
diff --git a/src/version.c b/src/version.c
index bb63095f10..2376b6983a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    337,
 /**/
     336,
 /**/