thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.470

Browse Source 
Problem:    Test 11 and 100 do not work properly on Windows.
Solution:   Avoid using feedkeys(). (Ken Takata)
This commit is contained in:
Bram Moolenaar
2014-10-09 15:37:06 +02:00
parent 4697ae00a7
commit 6885694e82
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/Make_dos.mak
View File

@@ -63,7 +63,7 @@ win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
fixff: fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ -$(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: report:
@echo "" @echo ""

4
src/testdir/test100.in
View File

@@ -16,7 +16,7 @@ STARTTEST
:new one :new one
:0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)' :0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
:call FillBuffer() :call FillBuffer()
:call feedkeys(":earlier 10\n", 't') :earlier 10
:call UndoLevel() :call UndoLevel()
:set ff=unix :set ff=unix
:%w! test.out :%w! test.out
@@ -24,7 +24,7 @@ STARTTEST
: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)'
:setlocal ul=2 :setlocal ul=2
:call FillBuffer() :call FillBuffer()
:call feedkeys(":earlier 10\n", 't') :earlier 10
:call UndoLevel() :call UndoLevel()
:setlocal ul=10 :setlocal ul=10
:call UndoLevel() :call UndoLevel()

6
src/testdir/test11.in
View File

@@ -46,13 +46,13 @@ STARTTEST
:w>>test.out " Append it to the output file :w>>test.out " Append it to the output file
:set shelltemp " need temp files here :set shelltemp " need temp files here
:au FilterReadPre *.out call rename(expand("<afile>"), expand("<afile>") . ".t") :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 'silent !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 !rm ' . shellescape(expand("<afile>")) . '.t'
:au FilterReadPost *.out '[,']s/x/X/g :au FilterReadPost *.out '[,']s/x/X/g
:e! test.out " Edit the output file :e! test.out " Edit the output file
:23,$!cat :23,$!cat
:23,$s/\r$// " remove CR for when sed adds them :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 FileReadPre *.gz call rename(expand("<afile>:r"), expand("<afile>"))
:au! FileReadPost *.gz '[,']s/l/L/ :au! FileReadPost *.gz '[,']s/l/L/
:$r Xtestfile.gz " Read compressed file :$r Xtestfile.gz " Read compressed file

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
470,
/**/ /**/
469, 469,
/**/ /**/