updated for version 7.4.406

Problem:    Test 72 and 100 fail on MS-Windows.
Solution:   Set fileformat to unix in the tests. (Taro Muraoka)

diff --git a/src/testdir/test100.in b/src/testdir/test100.in
index 61d28c15f094a75ace533de27c14b394de7e0d27..e703f1819919bf5d63387866997f02bf7de7c1bc 100644 (file)
--- a/src/testdir/test100.in
+++ b/src/testdir/test100.in
@@ -18,6 +18,7 @@ STARTTEST
 :call FillBuffer()
 :call feedkeys(":earlier 10\n", 't')
 :call UndoLevel()
+:set ff=unix
 :%w! test.out
 :new two
 :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
@@ -27,6 +28,7 @@ STARTTEST
 :call UndoLevel()
 :setlocal ul=10
 :call UndoLevel()
+:set ff=unix
 :%w >> test.out
 :wincmd p
 :redir >>test.out | echo "global value shouldn't be changed and still be 5!" | echo 'ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'|:setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |echo "" |redir end
@@ -35,6 +37,7 @@ STARTTEST
 :1put ='global value should be changed to 50'
 :2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)'
 :call UndoLevel()
+:set ff=unix
 :%w >> test.out
 :"sleep 10
 :"

diff --git a/src/testdir/test72.in b/src/testdir/test72.in
index 031edbf146885dcf4699fa9f212f524bb126f462..87c25d4863f5ba4378e85995bbf5c4846a615bcf 100644 (file)
--- a/src/testdir/test72.in
+++ b/src/testdir/test72.in
@@ -8,6 +8,7 @@ STARTTEST
 :" Test 'undofile': first a simple one-line change.
 :set nocompatible viminfo+=nviminfo visualbell
 :set ul=100 undofile nomore
+:set ff=unix
 :e! Xtestfile
 ggdGithis is one line\e:set ul=100
 :s/one/ONE/

diff --git a/src/version.c b/src/version.c
index 28a3fdb3715ecb6a74227444e6617ee4f52dc317..7e5b3cdd51660b9346f07cc09b286d057333415f 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 */
+/**/
+    406,
 /**/
     405,
 /**/