diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-01-22 17:28:02 -0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-22 17:28:02 -0800 |
| commit | 918b5d021d9ece1da76b0bd61ddefe32ba401c89 (patch) | |
| tree | 673c3e0f59e83a8ad0c265cde2072180a4655120 | |
| parent | 20fef8a7eb2da8a205fb9d58ae61c5dc79e60651 (diff) | |
| parent | 02113c328eb4448addae7c8c9260b5c47dd4cb64 (diff) | |
| download | rneovim-918b5d021d9ece1da76b0bd61ddefe32ba401c89.tar.gz rneovim-918b5d021d9ece1da76b0bd61ddefe32ba401c89.tar.bz2 rneovim-918b5d021d9ece1da76b0bd61ddefe32ba401c89.zip | |
Merge pull request #1864 from Hinidu/vim-7.4.500
vim-patch:7.4.500 and fix in vim-patch:7.4.406
| -rw-r--r-- | src/nvim/testdir/test100.in | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test72.in | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 4 insertions, 5 deletions
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 :" 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 1ca7867142..b0bd38b7de 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -267,7 +267,7 @@ static int included_patches[] = { //503, //502, //501 NA - //500, + 500, 499, //498 NA //497, |