aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/ex_getln.c8
-rw-r--r--src/nvim/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 69fb1d344a..810df627c1 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -287,6 +287,14 @@ getcmdline (
do_digraph(-1); /* init digraph typeahead */
+ // 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/nvim/version.c b/src/nvim/version.c
index 092d21f580..ebb6f5c4ed 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -258,7 +258,7 @@ static int included_patches[] = {
//340 NA
339,
338,
- //337,
+ 337,
//336,
335,
334,