Mercurial > vim

changeset 5993:0206ac84ff5f v7.4.337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bram Moolenaar <bram@vim.org>
date Wed, 25 Jun 2014 12:26:46 +0200
parents 05eac8f76d77
children ca18c797aafe
files src/ex_getln.c src/version.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
      */
--- 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,