From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 16 Aug 2014 15:34:34 +0000 (+0200)
Subject: updated for version 7.4.406
X-Git-Tag: v7.4.406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ddd1b5e3568f3402d5e58ee054c9c412eab0b94;p=vim

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 61d28c15f..e703f1819 100644
--- 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 031edbf14..87c25d486 100644
--- 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:set ul=100
 :s/one/ONE/
diff --git a/src/version.c b/src/version.c
index 28a3fdb37..7e5b3cdd5 100644
--- 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,
 /**/