diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-06-08 00:23:48 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-06-08 00:23:48 -0400 |
| commit | 7e74ba4108240bd20f4ee7116c407def0d9f4458 (patch) | |
| tree | 843ac76d6cf8235e7ecaf0dfa3b0fcafcad56e7d /src/nvim/getchar.c | |
| parent | 00fc216e2be1f3a32fd31fb08a2ecdc66acd0543 (diff) | |
| parent | 24a329b53aa3be03ed79768cca04d63d6bb93891 (diff) | |
| download | rneovim-7e74ba4108240bd20f4ee7116c407def0d9f4458.tar.gz rneovim-7e74ba4108240bd20f4ee7116c407def0d9f4458.tar.bz2 rneovim-7e74ba4108240bd20f4ee7116c407def0d9f4458.zip | |
Merge pull request #4804 from brcolow/vim-7.4.1150
vim-patch:7.4.{1150,1151}
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index dbf0322d78..ae1857f318 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1754,10 +1754,11 @@ static int vgetorpeek(int advance) || ((compl_cont_status & CONT_LOCAL) && (c1 == Ctrl_N || c1 == Ctrl_P))) ) { - if (c1 == K_SPECIAL) + if (c1 == K_SPECIAL) { nolmaplen = 2; - else { - LANGMAP_ADJUST(c1, (State & (CMDLINE | INSERT)) == 0); + } else { + LANGMAP_ADJUST(c1, (State & (CMDLINE | INSERT)) == 0 + && get_real_state() != SELECTMODE); nolmaplen = 0; } /* First try buffer-local mappings. */ |