From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 Nov 2014 15:39:28 +0000 (+0100)
Subject: updated for version 7.4.500
X-Git-Tag: v7.4.500
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72971a26119ce781161fb2a281fcaf27880a909e;p=vim

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

diff --git a/src/testdir/test72.in b/src/testdir/test72.in
index 87c25d486..a407eea4e 100644
--- a/src/testdir/test72.in
+++ b/src/testdir/test72.in
@@ -8,7 +8,6 @@ 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/
@@ -83,7 +82,7 @@ uu:w >>test.out
 :" With encryption, cryptmethod=blowfish
 :e! Xtestfile
 rubbish
-:set undofile cm=blowfish
+:set undofile cm=blowfish ff&
 ggdGijan
 feb
 mar
@@ -109,7 +108,7 @@ u:.w >>test.out
 :" With encryption, cryptmethod=blowfish2
 :e! Xtestfile
 rubbish
-:set undofile cm=blowfish2
+:set undofile cm=blowfish2 ff&
 ggdGijan
 feb
 mar
diff --git a/src/version.c b/src/version.c
index 9008518e2..7f27975a4 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 */
+/**/
+    500,
 /**/
     499,
 /**/