diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-08-16 17:34:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-08-16 17:34:34 +0200 |
| commit | 4929f1e126ee7903fde948a15cf3a88c6eb9e78e (patch) | |
| tree | b787a0b143e96b74557f520bdf2365bc165daea9 | |
| parent | 4c7cbc8156aba1ab32c864e12ff6e8213ee9d9ba (diff) | |
| download | vim-4929f1e126ee7903fde948a15cf3a88c6eb9e78e.tar.gz | |
Problem: Test 72 and 100 fail on MS-Windows.
Solution: Set fileformat to unix in the tests. (Taro Muraoka)
| -rw-r--r-- | src/testdir/test100.in | 3 | ||||
| -rw-r--r-- | src/testdir/test72.in | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test100.in b/src/testdir/test100.in index 61d28c15..e703f181 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 031edbf1..87c25d48 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 28a3fdb3..7e5b3cdd 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 */ /**/ + 406, +/**/ 405, /**/ 404, |