updated for version 7.4.337

Problem:    When there is an error preparing to edit the command line, the
            command won't be executed. (Hirohito Higashi)
Solution:   Reset did_emsg before editing.

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 2678184bcabeb42500c6658c60b07f0a95bf1842..d000112e62965c1dda9726123a779677cbf6b9b0 100644 (file)
--- 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 bb63095f10b871639c3d4fb4fdd9e4f1ed0ea0ad..2376b6983a71ad0f48411458f6b2fd90ef2f40f7 100644 (file)
--- 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,
 /**/