diff options
| author | Julian Mehne <github@nmehne.de> | 2014-12-14 13:37:27 +0100 |
|---|---|---|
| committer | Julian Mehne <github@nmehne.de> | 2014-12-14 14:38:06 +0100 |
| commit | c26c387490ca1507fb4841b80366e61bf57f7ce7 (patch) | |
| tree | 1cda724a6d23056887799fd001a011a56bb6c1b6 | |
| parent | 850b0b8663e27406db4e6bc44ff5f075326526d4 (diff) | |
| download | rneovim-c26c387490ca1507fb4841b80366e61bf57f7ce7.tar.gz rneovim-c26c387490ca1507fb4841b80366e61bf57f7ce7.tar.bz2 rneovim-c26c387490ca1507fb4841b80366e61bf57f7ce7.zip | |
vim-patch:7.4.470
Problem: Test 11 and 100 do not work properly on Windows.
Solution: Avoid using feedkeys(). (Ken Takata)
https://code.google.com/p/vim/source/detail?r=v7-4-470
| -rw-r--r-- | src/nvim/testdir/test100.in | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test11.in | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/testdir/test100.in b/src/nvim/testdir/test100.in index f6d2e3711b..2bf931fd4f 100644 --- a/src/nvim/testdir/test100.in +++ b/src/nvim/testdir/test100.in @@ -16,7 +16,7 @@ STARTTEST :new one :0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)' :call FillBuffer() -:call feedkeys(":earlier 10\n", 't') +:earlier 10 :call UndoLevel() :set ft=unix :%w! test.out @@ -24,7 +24,7 @@ STARTTEST :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)' :setlocal ul=2 :call FillBuffer() -:call feedkeys(":earlier 10\n", 't') +:earlier 10 :call UndoLevel() :setlocal ul=10 :call UndoLevel() diff --git a/src/nvim/testdir/test11.in b/src/nvim/testdir/test11.in index 47de470a2d..9e9e257c1d 100644 --- a/src/nvim/testdir/test11.in +++ b/src/nvim/testdir/test11.in @@ -46,13 +46,13 @@ STARTTEST :w>>test.out " Append it to the output file :set shelltemp " need temp files here :au FilterReadPre *.out call rename(expand("<afile>"), expand("<afile>") . ".t") -:au FilterReadPre *.out exe '!sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>")) -:au FilterReadPre *.out exe '!rm ' . shellescape(expand("<afile>")) . '.t' +:au FilterReadPre *.out exe 'silent !sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>")) +:au FilterReadPre *.out exe 'silent !rm ' . shellescape(expand("<afile>")) . '.t' :au FilterReadPost *.out '[,']s/x/X/g :e! test.out " Edit the output file :23,$!cat :23,$s/\r$// " remove CR for when sed adds them -:au! FileReadPre *.gz exe '!gzip -d ' . shellescape(expand("<afile>")) +:au! FileReadPre *.gz exe 'silent !gzip -d ' . shellescape(expand("<afile>")) :au FileReadPre *.gz call rename(expand("<afile>:r"), expand("<afile>")) :au! FileReadPost *.gz '[,']s/l/L/ :$r Xtestfile.gz " Read compressed file diff --git a/src/nvim/version.c b/src/nvim/version.c index 16efbbeee7..2b45dfbe4a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -196,7 +196,7 @@ static int included_patches[] = { 473, 472, //471 NA - //470, + 470, //469 NA //468, 467, |