mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-18 09:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1864 from Hinidu/vim-7.4.500

Browse Source 
vim-patch:7.4.500 and fix in vim-patch:7.4.406
This commit is contained in:
Justin M. Keyes
2015-01-22 17:28:02 -08:00
parent 20fef8a7eb 02113c328e
commit 918b5d021d
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/testdir/test100.in
View File

@@ -18,7 +18,7 @@ STARTTEST
:call FillBuffer() :call FillBuffer()
:earlier 10 :earlier 10
:call UndoLevel() :call UndoLevel()
:set ft=unix :set ff=unix
:%w! test.out :%w! test.out
:new two :new two
:0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)' :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
@@ -28,7 +28,7 @@ STARTTEST
:call UndoLevel() :call UndoLevel()
:setlocal ul=10 :setlocal ul=10
:call UndoLevel() :call UndoLevel()
:set ft=unix :set ff=unix
:%w >> test.out :%w >> test.out
:wincmd p :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 :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' :1put ='global value should be changed to 50'
:2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)' :2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)'
:call UndoLevel() :call UndoLevel()
:set ft=unix :set ff=unix
:%w >> test.out :%w >> test.out
:"sleep 10 :"sleep 10
:" :"

1
src/nvim/testdir/test72.in
View File

@@ -8,7 +8,6 @@ STARTTEST
:" Test 'undofile': first a simple one-line change. :" Test 'undofile': first a simple one-line change.
:set visualbell :set visualbell
:set ul=100 undofile nomore :set ul=100 undofile nomore
:set ft=unix
:e! Xtestfile :e! Xtestfile
ggdGithis is one line:set ul=100 ggdGithis is one line:set ul=100
:s/one/ONE/ :s/one/ONE/

2
src/nvim/version.c
View File

@@ -267,7 +267,7 @@ static int included_patches[] = {
//503, //503,
//502, //502,
//501 NA //501 NA
//500, 500,
499, 499,
//498 NA //498 NA
//497, //497,