From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 3 Oct 2006 13:36:13 +0000 (+0000)
Subject: updated for version 7.0-114
X-Git-Tag: v7.0.114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9dfd57f4a13e92417a32be419a0f1d2656d62dd;p=thirdparty%2Fvim.git

updated for version 7.0-114
---

diff --git a/src/getchar.c b/src/getchar.c
index f840e0bd4b..e623ce666c 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 50dc267150..5aaccff3ae 100644
--- 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 */
+/**/
+    114,
 /**/
     113,
 /**/