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 c0d2496b8c222265f4b84037fc27d4e472fcf528..dfc6dffcf1d59b480a676bf7131ae385185a1566 100644 (file)
--- 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 7449bfb6ff0a5f226791aa53908fa87442d833f2..3a04aab62b57047cdc2675ebcfc1cc92ead340a4 100644 (file)
--- 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,
 /**/