summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_getln.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 2678184bc..d000112e6 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 bb63095f1..2376b6983 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 337,
+/**/
336,
/**/
335,