From 850b0b8663e27406db4e6bc44ff5f075326526d4 Mon Sep 17 00:00:00 2001 From: Julian Mehne Date: Sun, 14 Dec 2014 13:25:18 +0100 Subject: vim-patch:7.4.463 Problem: Test 86 and 87 may hang on MS-Windows. Solution: Call inputrestore() after inputsave(). (Ken Takata) https://code.google.com/p/vim/source/detail?r=v7-4-463 --- src/nvim/testdir/test86.in | 1 + src/nvim/testdir/test87.in | 1 + 2 files changed, 2 insertions(+) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/test86.in b/src/nvim/testdir/test86.in index 11ff35cfd3..99102c4d89 100644 --- a/src/nvim/testdir/test86.in +++ b/src/nvim/testdir/test86.in @@ -1383,6 +1383,7 @@ EOF :debug silent! py test_keyboard_interrupt() :redir END :0 debuggreedy +:call inputrestore() :silent $put =output :unlet output :py del test_keyboard_interrupt diff --git a/src/nvim/testdir/test87.in b/src/nvim/testdir/test87.in index e45883b59d..0bb5119624 100644 --- a/src/nvim/testdir/test87.in +++ b/src/nvim/testdir/test87.in @@ -1360,6 +1360,7 @@ EOF :debug silent! py3 test_keyboard_interrupt() :redir END :0 debuggreedy +:call inputrestore() :silent $put =output :unlet output :py3 del test_keyboard_interrupt -- cgit From c26c387490ca1507fb4841b80366e61bf57f7ce7 Mon Sep 17 00:00:00 2001 From: Julian Mehne Date: Sun, 14 Dec 2014 13:37:27 +0100 Subject: 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 --- src/nvim/testdir/test100.in | 4 ++-- src/nvim/testdir/test11.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/nvim/testdir') 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(""), expand("") . ".t") -:au FilterReadPre *.out exe '!sed s/e/E/ ' . shellescape(expand("")) . ".t >" . shellescape(expand("")) -:au FilterReadPre *.out exe '!rm ' . shellescape(expand("")) . '.t' +:au FilterReadPre *.out exe 'silent !sed s/e/E/ ' . shellescape(expand("")) . ".t >" . shellescape(expand("")) +:au FilterReadPre *.out exe 'silent !rm ' . shellescape(expand("")) . '.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("")) +:au! FileReadPre *.gz exe 'silent !gzip -d ' . shellescape(expand("")) :au FileReadPre *.gz call rename(expand(":r"), expand("")) :au! FileReadPost *.gz '[,']s/l/L/ :$r Xtestfile.gz " Read compressed file -- cgit