diff options
| author | watiko <service@mail.watiko.net> | 2016-01-14 18:16:44 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-02-01 03:43:36 +0900 |
| commit | 6d1b948b6b98d34b1ca8c62a7bb6d08f85f85491 (patch) | |
| tree | 8863ccee421162b0b2cc6b3bd30c807563d75e43 | |
| parent | 4d074e39ea1228e4f04c70ecfe4e1196a9638176 (diff) | |
| download | rneovim-6d1b948b6b98d34b1ca8c62a7bb6d08f85f85491.tar.gz rneovim-6d1b948b6b98d34b1ca8c62a7bb6d08f85f85491.tar.bz2 rneovim-6d1b948b6b98d34b1ca8c62a7bb6d08f85f85491.zip | |
vim-patch:7.4.764
Problem: test_increment fails on MS-Windows. (Ken Takata)
Solution: Clear Visual mappings. (Taro Muraoka)
https://github.com/vim/vim/commit/6a57cce04801d3e8fe30d0dcd31f9325b38de2fe
| -rw-r--r-- | src/nvim/testdir/test_increment.in | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_increment.in b/src/nvim/testdir/test_increment.in index 5b0ad06cf8..00e9ad0172 100644 --- a/src/nvim/testdir/test_increment.in +++ b/src/nvim/testdir/test_increment.in @@ -71,7 +71,10 @@ foobar-10 STARTTEST :so small.vim - +:" +:" Avoid CTRL-X being mapped in Visual mode for MS-Windows +:vmapclear +:" :" Test 1 :/^S1=/+,/^E1=/-y a :/^E1/+put a diff --git a/src/nvim/version.c b/src/nvim/version.c index 24fa8defe8..e5ff3a2651 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -370,7 +370,7 @@ static int included_patches[] = { // 767, // 766 NA // 765, - // 764, + 764, // 763 NA // 762 NA // 761 NA |