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 55fdd31122f64da1dd5b325d4e50acdf1c478b05..9c1ab0f4bdb83f805f04551855a6e7d46b04c558 100644 (file)
--- 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 b5b86e5148973230fa7066539214ddc3d1939504..c0710733798197328f8cbda649ef94ed75fd1358 100644 (file)
--- 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,
 /**/