diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2014-09-18 08:05:08 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2014-09-19 19:51:21 +0900 |
| commit | 1fe6dc03aa924110cca27fd993c584ed1b3c7c83 (patch) | |
| tree | c3e664025352082311be3a13a48a1bcd6779dba5 /src | |
| parent | 53d15c2c25199f8e44e9a8a74898f06a85e7c83b (diff) | |
| download | rneovim-1fe6dc03aa924110cca27fd993c584ed1b3c7c83.tar.gz rneovim-1fe6dc03aa924110cca27fd993c584ed1b3c7c83.tar.bz2 rneovim-1fe6dc03aa924110cca27fd993c584ed1b3c7c83.zip | |
vim-patch:7.4.374
Problem: Character after "fb" command not mapped if it might be a composing
character.
Solution: Don't disable mapping when looking for a composing character.
(Jacob Niehus)
https://code.google.com/p/vim/source/detail?r=v7-4-374
Diffstat (limited to 'src')
| -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 e80c1f81a1..58b3e0233c 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, |