summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-11-16 14:06:08 +0100
committerBram Moolenaar <Bram@vim.org>2010-11-16 14:06:08 +0100
commit66b4bf8980efd6b6da0963cd6edcfb4bdd9ad2ec (patch)
treedc71f0b92520cf7ffccd8ab622dee0cbceb04899
parentbf55e1442dfb5cabf68fc9c019cc834f7e652c3e (diff)
updated for version 7.3.057v7.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.
-rw-r--r--src/ex_getln.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
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
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 57,
+/**/
56,
/**/
55,