summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-16 14:23:04 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-16 14:23:04 +0000
commit5495cc9fdf37079bd4b8e6545c9b504ef7a4d596 (patch)
treeb6bdba1012ca696ef6ee68ee1a12a85d87218346
parent18a0b1286b7770b42163c63246a6d4a4ff2bcf55 (diff)
downloadvim-git-5495cc9fdf37079bd4b8e6545c9b504ef7a4d596.tar.gz
updated for version 7.0-055v7.0.055
-rw-r--r--src/edit.c2
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index bf0f01420..4ee21d5f3 100644
--- 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 3ac20ff85..ba3d114e1 100644
--- 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 54b457e2a..675985f1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 55,
+/**/
54,
/**/
53,