diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-22 00:41:55 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-22 00:41:55 -0500 |
| commit | 9e00724c3874ecc11dbc1d8a8cbbd79f5fd0b651 (patch) | |
| tree | 4c59b800e819b330d079645584b2de48c689b355 | |
| parent | 609dad3799caff18bdcf043585c17e0d7d11d3d0 (diff) | |
| parent | 5b263ac6adf76b025aed9c2edd30dbc35dd4e8cc (diff) | |
| download | rneovim-9e00724c3874ecc11dbc1d8a8cbbd79f5fd0b651.tar.gz rneovim-9e00724c3874ecc11dbc1d8a8cbbd79f5fd0b651.tar.bz2 rneovim-9e00724c3874ecc11dbc1d8a8cbbd79f5fd0b651.zip | |
Merge pull request #4307 from jbradaric/vim-7.4.870
vim-patch:7.4.870
| -rw-r--r-- | src/nvim/getchar.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 89d22ad811..73b3de0b5d 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1380,13 +1380,15 @@ int vgetc(void) } else { mod_mask = 0x0; last_recorded_len = 0; - for (;; ) { /* this is done twice if there are modifiers */ - if (mod_mask) { /* no mapping after modifier has been read */ + for (;; ) { // this is done twice if there are modifiers + bool did_inc = false; + if (mod_mask) { // no mapping after modifier has been read ++no_mapping; ++allow_keys; + did_inc = true; // mod_mask may change value } - c = vgetorpeek(TRUE); - if (mod_mask) { + c = vgetorpeek(true); + if (did_inc) { --no_mapping; --allow_keys; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 3470e1f354..ca685d32c3 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -420,7 +420,7 @@ static int included_patches[] = { // 873 NA // 872 NA // 871, - // 870, + 870, // 869 NA 868, // 867 NA |