diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-05 16:39:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-05 16:39:28 +0100 |
| commit | 72971a26119ce781161fb2a281fcaf27880a909e (patch) | |
| tree | 42d382712f57f17e96fcf0c20cc766fb7d104a79 | |
| parent | e90c853ff6dcef63bff80be0e7379a80c276af8f (diff) | |
| download | vim-git-72971a26119ce781161fb2a281fcaf27880a909e.tar.gz | |
updated for version 7.4.500v7.4.500
Problem: Test 72 still fails once in a while.
Solution: Don't set 'fileformat' to unix, reset it. (Ken Takata)
| -rw-r--r-- | src/testdir/test72.in | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 3 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 500, +/**/ 499, /**/ 498, |