From 83d8e87a92df604c54e1cb847afb6714d3633565 Mon Sep 17 00:00:00 2001
From: Pavel Platto <hinidu@gmail.com>
Date: Wed, 21 Jan 2015 18:48:09 +0000
Subject: vim-patch:7.4.500

Problem:    Test 72 still fails once in a while.
Solution:   Don't set 'fileformat' to unix, reset it. (Ken Takata)

https://code.google.com/p/vim/source/detail?r=v7-4-500
---
 src/nvim/testdir/test72.in | 1 -
 src/nvim/version.c         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test72.in b/src/nvim/testdir/test72.in
index 20897f01a0..912fa19ba6 100644
--- a/src/nvim/testdir/test72.in
+++ b/src/nvim/testdir/test72.in
@@ -8,7 +8,6 @@ STARTTEST
 :" Test 'undofile': first a simple one-line change.
 :set visualbell
 :set ul=100 undofile nomore
-:set ft=unix
 :e! Xtestfile
 ggdGithis is one line:set ul=100
 :s/one/ONE/
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 83dc3c700b..612408c414 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -245,7 +245,7 @@ static int included_patches[] = {
   //503,
   //502,
   //501 NA
-  //500,
+  500,
   499,
   //498 NA
   //497,
-- 
cgit 


From 02113c328eb4448addae7c8c9260b5c47dd4cb64 Mon Sep 17 00:00:00 2001
From: Pavel Platto <hinidu@gmail.com>
Date: Wed, 21 Jan 2015 23:57:14 +0200
Subject: Replace erroneous ft=unix by ff=unix from 7.4.406

---
 src/nvim/testdir/test100.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test100.in b/src/nvim/testdir/test100.in
index 083b4324b2..bc1a55e4d3 100644
--- a/src/nvim/testdir/test100.in
+++ b/src/nvim/testdir/test100.in
@@ -18,7 +18,7 @@ STARTTEST
 :call FillBuffer()
 :earlier 10
 :call UndoLevel()
-:set ft=unix
+:set ff=unix
 :%w! test.out
 :new two
 :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
@@ -28,7 +28,7 @@ STARTTEST
 :call UndoLevel()
 :setlocal ul=10
 :call UndoLevel()
-:set ft=unix
+: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
@@ -37,7 +37,7 @@ STARTTEST
 :1put ='global value should be changed to 50'
 :2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)'
 :call UndoLevel()
-:set ft=unix
+:set ff=unix
 :%w >> test.out
 :"sleep 10
 :"
-- 
cgit