From 20c3892e545da821ad22cc266d7c49f904bbf333 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 23 Jul 2014 20:41:14 +0200 Subject: 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) --- src/getchar.c | 5 +++++ src/version.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/getchar.c b/src/getchar.c index 55fdd31122..9c1ab0f4bd 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 b5b86e5148..c071073379 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, /**/ -- cgit v1.2.3