diff options
| author | Pavel Platto <hinidu@gmail.com> | 2015-01-21 18:48:09 +0000 |
|---|---|---|
| committer | Pavel Platto <hinidu@gmail.com> | 2015-01-21 23:54:51 +0200 |
| commit | 83d8e87a92df604c54e1cb847afb6714d3633565 (patch) | |
| tree | aae2954fd3ac85e4707c9049d96e411b1b5542b2 | |
| parent | d550eecf7092397d064df26850d4a09d9ab4a481 (diff) | |
| download | rneovim-83d8e87a92df604c54e1cb847afb6714d3633565.tar.gz rneovim-83d8e87a92df604c54e1cb847afb6714d3633565.tar.bz2 rneovim-83d8e87a92df604c54e1cb847afb6714d3633565.zip | |
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
| -rw-r--r-- | src/nvim/testdir/test72.in | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 2 deletions
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, |