summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-07-23 20:41:14 +0200
committerBram Moolenaar <Bram@vim.org>2014-07-23 20:41:14 +0200
commit20c3892e545da821ad22cc266d7c49f904bbf333 (patch)
tree88b4c96e407ad216f38bc211f615b3b90cb5ca17
parent17529ae026c683a0973e41bdd3ec93a4da2bbe6f (diff)
downloadvim-git-20c3892e545da821ad22cc266d7c49f904bbf333.tar.gz
updated for version 7.4.382v7.4.382
Problem: Mapping characters may not work after typing Esc in Insert mode. Solution: Fix the noremap flags for inserted characters. (Jacob Niehus)
-rw-r--r--src/getchar.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
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
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 382,
+/**/
381,
/**/
380,