summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-10-03 13:36:13 +0000
committerBram Moolenaar <Bram@vim.org>2006-10-03 13:36:13 +0000
commitd9dfd57f4a13e92417a32be419a0f1d2656d62dd (patch)
tree0a7b6d8f3bd56dd5b5482c86ade7143a215d9e24
parent132283f943df785d6c4ea89317250fa13bea0315 (diff)
downloadvim-git-d9dfd57f4a13e92417a32be419a0f1d2656d62dd.tar.gz
updated for version 7.0-114v7.0.114
-rw-r--r--src/getchar.c11
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/getchar.c b/src/getchar.c
index f840e0bd4..e623ce666 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1960,10 +1960,13 @@ vgetorpeek(advance)
c = Ctrl_C;
flush_buffers(TRUE); /* flush all typeahead */
- /* Also record this character, it might be needed to
- * get out of Insert mode. */
- *typebuf.tb_buf = c;
- gotchars(typebuf.tb_buf, 1);
+ if (advance)
+ {
+ /* Also record this character, it might be needed to
+ * get out of Insert mode. */
+ *typebuf.tb_buf = c;
+ gotchars(typebuf.tb_buf, 1);
+ }
cmd_silent = FALSE;
break;
diff --git a/src/version.c b/src/version.c
index 50dc26715..5aaccff3a 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 */
/**/
+ 114,
+/**/
113,
/**/
112,