From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Jul 2014 18:41:14 +0000 (+0200)
Subject: updated for version 7.4.382
X-Git-Tag: v7.4.382
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20c3892e545da821ad22cc266d7c49f904bbf333;p=vim

updated for version 7.4.382
Problem:    Mapping characters may not work after typing Esc in Insert mode.
Solution:   Fix the noremap flags for inserted characters. (Jacob Niehus)
---

diff --git a/src/getchar.c b/src/getchar.c
index 55fdd3112..9c1ab0f4b 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2731,6 +2731,11 @@ vgetorpeek(advance)
 		}
 		if (c < 0)
 		    continue;	/* end of input script reached */
+
+		/* Allow mapping for just typed characters. When we get here c
+		 * is the number of extra bytes and typebuf.tb_len is 1. */
+		for (n = 1; n <= c; ++n)
+		    typebuf.tb_noremap[typebuf.tb_off + n] = RM_YES;
 		typebuf.tb_len += c;
 
 		/* buffer full, don't map */
diff --git a/src/version.c b/src/version.c
index b5b86e514..c07107337 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    382,
 /**/
     381,
 /**/