diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 10:59:27 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 10:59:27 -0400 |
| commit | 6cc6b0ff9eb5bba50d125199b984cb1a374e4f77 (patch) | |
| tree | a27b6159585697dd3ded100ad20754268a2eaf85 /src | |
| parent | 53d15c2c25199f8e44e9a8a74898f06a85e7c83b (diff) | |
| parent | c5c506666c20c371ba17a626de0bb913080663dc (diff) | |
| download | rneovim-6cc6b0ff9eb5bba50d125199b984cb1a374e4f77.tar.gz rneovim-6cc6b0ff9eb5bba50d125199b984cb1a374e4f77.tar.bz2 rneovim-6cc6b0ff9eb5bba50d125199b984cb1a374e4f77.zip | |
Merge pull request #1192 from Shougo/vim-patch-7.4.382
vim-patch:7.4.382
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/getchar.c | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 0d61172d69..c3f6e2c2b6 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2209,6 +2209,12 @@ static int vgetorpeek(int 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/nvim/version.c b/src/nvim/version.c index e80c1f81a1..f80b2f8a41 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -213,7 +213,7 @@ static int included_patches[] = { //385, //384 NA 383, - //382, + 382, 381, //380 NA 379, |