diff --git a/src/ex_getln.c b/src/ex_getln.c
index 2678184..d000112 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -342,6 +342,13 @@
     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 bb63095..2376b69 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    337,
+/**/
     336,
 /**/
     335,