From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 1 Jul 2013 19:00:35 +0000 (+0200)
Subject: updated for version 7.3.1283
X-Git-Tag: v7.3.1283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72fe56f298009957c9360016f5234686eb83e0c1;p=vim

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 c7e0714e1..155fd413b 100644
--- 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!lV'Þ}Mg ê£V©çE#3Ž2Ué—
-end of cm=zip bytes
-
-start of cm=blowfish bytes
-VimCrypt~02!k)¾—#ÝSœõ=ºàÈ#¥M´†JÃAÍ¥M´†!€›õáÒ‚˜÷
Ú
-end of cm=blowfish bytes
diff --git a/src/testdir/test71a.in b/src/testdir/test71a.in
new file mode 100644
index 000000000..85bd22cd0
--- /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!lV'Þ}Mg ê£V©çE#3Ž2Ué—
+end of cm=zip bytes
+
+start of cm=blowfish bytes
+VimCrypt~02!k)¾—#ÝSœõ=ºàÈ#¥M´†JÃAÍ¥M´†!€›õáÒ‚˜÷
Ú
+end of cm=blowfish bytes
diff --git a/src/version.c b/src/version.c
index 9647ed3e3..4b0e34003 100644
--- 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,
 /**/