diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 17:47:51 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 17:47:51 -0400 |
| commit | a85f7d35d805f05b6b432d167c129448ffc83fa4 (patch) | |
| tree | 0ee4c4cdcbcfb5cfc5fbd180509e9f983e514057 | |
| parent | 1fdfe3a484bf8f1c452023439ce2c9e61b856299 (diff) | |
| parent | 1fe6dc03aa924110cca27fd993c584ed1b3c7c83 (diff) | |
| download | rneovim-a85f7d35d805f05b6b432d167c129448ffc83fa4.tar.gz rneovim-a85f7d35d805f05b6b432d167c129448ffc83fa4.tar.bz2 rneovim-a85f7d35d805f05b6b432d167c129448ffc83fa4.zip | |
Merge pull request #1189 from Shougo/vim-patch-7.4.374
vim-patch:7.4.374
| -rw-r--r-- | src/nvim/normal.c | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index cc82630548..391828da28 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -845,7 +845,10 @@ getcount: /* When getting a text character and the next character is a * multi-byte character, it could be a composing character. - * However, don't wait for it to arrive. */ + * However, don't wait for it to arrive. Also, do enable mapping, + * because if it's put back with vungetc() it's too late to apply + * mapping. */ + no_mapping--; while (enc_utf8 && lang && (c = vpeekc()) > 0 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1)) { c = plain_vgetc(); @@ -857,6 +860,7 @@ getcount: else ca.ncharC2 = c; } + no_mapping++; } --no_mapping; --allow_keys; diff --git a/src/nvim/version.c b/src/nvim/version.c index 581f057f7c..9c9c917052 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -221,7 +221,7 @@ static int included_patches[] = { 377, 376, //375, - //374, + 374, 373, 372, 371, |