updated for version 7.0-055

diff --git a/src/edit.c b/src/edit.c
index bf0f01420dd564542ebd7a2163ad01b793581915..4ee21d5f36177c93d461b22d72b43161d30de403 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -882,6 +882,7 @@ edit(cmdchar, startln, count)
                /* Close the cmdline window. */
                cmdwin_result = K_IGNORE;
                got_int = FALSE; /* don't stop executing autocommands et al. */
+               nomove = TRUE;
                goto doESCkey;
            }
 #endif
@@ -2414,6 +2415,7 @@ set_completion(startcol, list)
     compl_matches = ins_compl_make_cyclic();
     compl_started = TRUE;
     compl_used_match = TRUE;
+    compl_cont_status = 0;
 
     compl_curr_match = compl_first_match;
     ins_complete(Ctrl_N);

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 3ac20ff85aea449ce666450c684df85c0cf70755..ba3d114e1c309111044739a4ae6e5403050ab56b 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5982,6 +5982,8 @@ ex_window()
     typestr[0] = cmdwin_type;
     typestr[1] = NUL;
     apply_autocmds(EVENT_CMDWINENTER, typestr, typestr, FALSE, curbuf);
+    if (restart_edit != 0)     /* autocmd with ":startinsert" */
+       stuffcharReadbuff(K_NOP);
 # endif
 
     i = RedrawingDisabled;

diff --git a/src/version.c b/src/version.c
index 54b457e2aa3b5c10b7add0b27181b4150b083eaa..675985f1dbe0c48c213c65bb7bd872bed31c8dee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    55,
 /**/
     54,
 /**/