updated for version 7.4.470

Problem:    Test 11 and 100 do not work properly on Windows.
Solution:   Avoid using feedkeys(). (Ken Takata)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index cd7aa4d487c38b545ef65511916f3e6d170652a7..38264f2eaf900a347f590ed2f5a2b2ee02474f78 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -63,7 +63,7 @@ win32:        fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
 fixff:
        -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
        -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
-               dotest.in test60.ok test71.ok test74.ok
+               dotest.in test60.ok test71.ok test74.ok test100.ok
 
 report:
        @echo ""

diff --git a/src/testdir/test100.in b/src/testdir/test100.in
index e703f1819919bf5d63387866997f02bf7de7c1bc..7bd88fe9c9ffd622dde3aefe55e4f4347eef60e4 100644 (file)
--- a/src/testdir/test100.in
+++ b/src/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 ff=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/testdir/test11.in b/src/testdir/test11.in
index 47de470a2d8c3caae41243721ed75113f679ffd4..9e9e257c1d28f4029a4e55b79cb34e1ca0776d4f 100644 (file)
--- a/src/testdir/test11.in
+++ b/src/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/version.c b/src/version.c
index 8d1e4a0dd9ee3703d1681d4fbb0238d8b9addb98..fca5cb65362328bbaa13c42f863deb66effb7f10 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    470,
 /**/
     469,
 /**/