IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1189 from Shougo/vim-patch-7.4.374

Browse Source 
vim-patch:7.4.374
This commit is contained in:
Justin M. Keyes 2014-09-19 17:47:51 -04:00
commit a85f7d35d8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/normal.c
View File

@ -845,7 +845,10 @@ getcount:
/* When getting a text character and the next character is a /* When getting a text character and the next character is a
* multi-byte character, it could be a composing character. * 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 while (enc_utf8 && lang && (c = vpeekc()) > 0
&& (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1)) { && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1)) {
c = plain_vgetc(); c = plain_vgetc();
@ -857,6 +860,7 @@ getcount:
else else
ca.ncharC2 = c; ca.ncharC2 = c;
} }
no_mapping++;
} }
--no_mapping; --no_mapping;
--allow_keys; --allow_keys;

2
src/nvim/version.c
View File

@ -221,7 +221,7 @@ static int included_patches[] = {
377, 377,
376, 376,
//375, //375,
//374, 374,
373, 373,
372, 372,
371, 371,