diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-30 00:10:26 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-30 00:10:26 -0500 |
| commit | a31bcfb98afbe4d845911b4d90255c18769f197a (patch) | |
| tree | 58651f5390fa7b3ae968a2c2978fde7c35f91ef4 /src | |
| parent | 13d950f6edf5c1d3cc28059bfe497df3c677d45a (diff) | |
| parent | e27460b60cb3d725ecfe8ba34438642fdb174280 (diff) | |
| download | rneovim-a31bcfb98afbe4d845911b4d90255c18769f197a.tar.gz rneovim-a31bcfb98afbe4d845911b4d90255c18769f197a.tar.bz2 rneovim-a31bcfb98afbe4d845911b4d90255c18769f197a.zip | |
Merge pull request #1742 from fwalch/vim-7.4.552
vim-patch:7.4.552
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/getchar.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index d0eebf8fea..e12601e4c9 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1775,7 +1775,7 @@ static int vgetorpeek(int advance) if (c1 == K_SPECIAL) nolmaplen = 2; else { - LANGMAP_ADJUST(c1, TRUE); + LANGMAP_ADJUST(c1, (State & INSERT) == 0); nolmaplen = 0; } /* First try buffer-local mappings. */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 513b03095b..c1fe19bb9c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -186,7 +186,7 @@ static int included_patches[] = { //555 NA //554, //553, - //552, + 552, //551, //550, 549, |