patch 7.4.764

Problem:    test_increment fails on MS-Windows. (Ken Takata)
Solution:   Clear Visual mappings. (Taro Muraoka)

diff --git a/src/testdir/test_increment.in b/src/testdir/test_increment.in
index 5b0ad06cf815cca7dd776a82c3718e8447a009ac..00e9ad01722f468fac4b0db8f29961adf031d881 100644 (file)
--- 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 f6a5afbdbdbacfb272fc5671b4541747e2dd1107..fe3b7fc5a39fc00b3c27097f6008a3a826cfdb40 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    764,
 /**/
     763,
 /**/