updated for version 7.3.1283

Problem:    Test 71 fails on MS-Windows.
Solution:   Put the binary data in a separate file. (Ken Takata)

diff --git a/src/testdir/test71.in b/src/testdir/test71.in
index c7e0714e1cff637dccccd9870ab1c9da4a0c2a90..155fd413bca173f28a2fe943d62643c9a7af19ac 100644 (file)
--- a/src/testdir/test71.in
+++ b/src/testdir/test71.in
@@ -1,7 +1,12 @@
 Test for encryption.
+The test data is in another file to avoid problems with 'encoding', especially
+cp932.
 
 STARTTEST
 :so small.vim
+:set enc=latin1
+:bwipe!
+:r test71a.in
 :/^start of text/+1
 :let text_lines = getline('.', line('.') + 2)
 :/^start of cm=zip bytes/+1
@@ -60,16 +65,3 @@ barbar
 :qa!
 ENDTEST
 
-start of text
-01234567890123456789012345678901234567
-line 2  foo bar blah
-line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-end of text
-
-start of cm=zip bytes
-VimCrypt~01!\ 6\1clV'Þ}Mg ê£V©ç\aE#3\8e2Ué\97
-end of cm=zip bytes
-
-start of cm=blowfish bytes
-VimCrypt~02!k)¾\17\97#\16ÝS\9cõ=ºàÈ#¥M´\86JÃAÍ¥M´\86!\80\15\9bõ\ fáÒ\19\82\16\98÷\rÚ
-end of cm=blowfish bytes

diff --git a/src/testdir/test71a.in b/src/testdir/test71a.in
new file mode 100644 (file)
index 0000000..85bd22c
--- /dev/null
+++ b/src/testdir/test71a.in
@@ -0,0 +1,14 @@
+
+start of text
+01234567890123456789012345678901234567
+line 2  foo bar blah
+line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+end of text
+
+start of cm=zip bytes
+VimCrypt~01!\ 6\1clV'Þ}Mg ê£V©ç\aE#3\8e2Ué\97
+end of cm=zip bytes
+
+start of cm=blowfish bytes
+VimCrypt~02!k)¾\17\97#\16ÝS\9cõ=ºàÈ#¥M´\86JÃAÍ¥M´\86!\80\15\9bõ\ fáÒ\19\82\16\98÷\rÚ
+end of cm=blowfish bytes

diff --git a/src/version.c b/src/version.c
index 9647ed3e36368eabeb5b7ce575c2d64c456254f9..4b0e34003f165affff1374f38e678df11e9e12a5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1283,
 /**/
     1282,
 /**/