diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-06-28 19:24:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-06-28 19:24:39 +0200 |
| commit | 6a57cce04801d3e8fe30d0dcd31f9325b38de2fe (patch) | |
| tree | 0d1fa177554d3dc6145d348860b5ca62f62fa110 | |
| parent | 1f860d8590460b6f13b39bebf191b81572fa0fdf (diff) | |
patch 7.4.764v7.4.764
Problem: test_increment fails on MS-Windows. (Ken Takata)
Solution: Clear Visual mappings. (Taro Muraoka)
| -rw-r--r-- | src/testdir/test_increment.in | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_increment.in b/src/testdir/test_increment.in index 5b0ad06cf8..00e9ad0172 100644 --- a/src/testdir/test_increment.in +++ b/src/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/version.c b/src/version.c index f6a5afbdbd..fe3b7fc5a3 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 764, +/**/ 763, /**/ 762, |