From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 16 Nov 2010 13:06:08 +0000 (+0100)
Subject: updated for version 7.3.057
X-Git-Tag: v7.3.057
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66b4bf8980efd6b6da0963cd6edcfb4bdd9ad2ec;p=thirdparty%2Fvim.git

updated for version 7.3.057
Problem:    Segfault with command line abbreviation. (Randy Morris)
Solution:   Don't retrigger the abbreviation when abandoning the command line.
            Continue editing the command line after the error.
---

diff --git a/src/ex_getln.c b/src/ex_getln.c
index c0d2496b8c..dfc6dffcf1 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -712,7 +712,11 @@ getcmdline(firstc, count, indent)
 		    }
 		}
 		beep_flush();
-		c = ESC;
+		got_int = FALSE;	/* don't abandon the command line */
+		did_emsg = FALSE;
+		emsg_on_display = FALSE;
+		redrawcmd();
+		goto cmdline_not_changed;
 	    }
 #endif
 	    else
diff --git a/src/version.c b/src/version.c
index 7449bfb6ff..3a04aab62b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    57,
 /**/
     56,
 /**/