diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 23:03:58 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 23:03:58 -0500 |
| commit | 269f3ac779ec607cc334ae03dafd19a150048029 (patch) | |
| tree | ed83ad70d63a889428c3de02119c1c3eacc66d77 | |
| parent | c2ab8441335af61495e9dd56e4a58cc38aa1a4ea (diff) | |
| parent | b1b8759fc31c437b60de534f547d9f055d5d3ad6 (diff) | |
| download | rneovim-269f3ac779ec607cc334ae03dafd19a150048029.tar.gz rneovim-269f3ac779ec607cc334ae03dafd19a150048029.tar.bz2 rneovim-269f3ac779ec607cc334ae03dafd19a150048029.zip | |
Merge pull request #4010 from watiko/vim-7.4.614
vim-patch:7.4.614
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/mapping_spec.lua | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 71ac000279..1d98afaaa1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -510,7 +510,7 @@ static int included_patches[] = { 617, // 616, 615, - // 614, + 614, // 613, 612, // 611 NA diff --git a/test/functional/legacy/mapping_spec.lua b/test/functional/legacy/mapping_spec.lua index 3f86ec60de..a0d19926cb 100644 --- a/test/functional/legacy/mapping_spec.lua +++ b/test/functional/legacy/mapping_spec.lua @@ -84,6 +84,23 @@ describe('mapping', function() +]]) end) + it('feedkeys', function() + insert([[ + a b c d + a b c d + ]]) + + -- Vim's issue #212 (feedkeys insert mapping at current position) + execute('nnoremap . :call feedkeys(".", "in")<cr>') + feed('/^a b<cr>') + feed('0qqdw.ifoo<esc>qj0@q<esc>') + execute('unmap .') + expect([[ + fooc d + fooc d + ]]) + end) + it('i_CTRL-G_U', function() -- <c-g>U<cursor> works only within a single line execute('imapclear') |