|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.470
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.470
|
|
|
22c937 |
Problem: Test 11 and 100 do not work properly on Windows.
|
|
|
22c937 |
Solution: Avoid using feedkeys(). (Ken Takata)
|
|
|
22c937 |
Files: src/testdir/Make_dos.mak, src/testdir/test11.in,
|
|
|
22c937 |
src/testdir/test100.in
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.469/src/testdir/Make_dos.mak 2014-08-16 18:36:38.593993280 +0200
|
|
|
22c937 |
--- src/testdir/Make_dos.mak 2014-10-09 15:26:56.720903277 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 63,69 ****
|
|
|
22c937 |
fixff:
|
|
|
22c937 |
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
|
|
|
22c937 |
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
|
|
|
22c937 |
! dotest.in test60.ok test71.ok test74.ok
|
|
|
22c937 |
|
|
|
22c937 |
report:
|
|
|
22c937 |
@echo ""
|
|
|
22c937 |
--- 63,69 ----
|
|
|
22c937 |
fixff:
|
|
|
22c937 |
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
|
|
|
22c937 |
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
|
|
|
22c937 |
! dotest.in test60.ok test71.ok test74.ok test100.ok
|
|
|
22c937 |
|
|
|
22c937 |
report:
|
|
|
22c937 |
@echo ""
|
|
|
22c937 |
*** ../vim-7.4.469/src/testdir/test11.in 2010-08-08 13:16:36.000000000 +0200
|
|
|
22c937 |
--- src/testdir/test11.in 2014-10-09 15:34:19.588904244 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 46,58 ****
|
|
|
22c937 |
:w>>test.out " Append it to the output file
|
|
|
22c937 |
:set shelltemp " need temp files here
|
|
|
22c937 |
:au FilterReadPre *.out call rename(expand("<afile>"), expand("<afile>") . ".t")
|
|
|
22c937 |
! :au FilterReadPre *.out exe '!sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>"))
|
|
|
22c937 |
! :au FilterReadPre *.out exe '!rm ' . shellescape(expand("<afile>")) . '.t'
|
|
|
22c937 |
:au FilterReadPost *.out '[,']s/x/X/g
|
|
|
22c937 |
:e! test.out " Edit the output file
|
|
|
22c937 |
:23,$!cat
|
|
|
22c937 |
:23,$s/\r$// " remove CR for when sed adds them
|
|
|
22c937 |
! :au! FileReadPre *.gz exe '!gzip -d ' . shellescape(expand("<afile>"))
|
|
|
22c937 |
:au FileReadPre *.gz call rename(expand("<afile>:r"), expand("<afile>"))
|
|
|
22c937 |
:au! FileReadPost *.gz '[,']s/l/L/
|
|
|
22c937 |
:$r Xtestfile.gz " Read compressed file
|
|
|
22c937 |
--- 46,58 ----
|
|
|
22c937 |
:w>>test.out " Append it to the output file
|
|
|
22c937 |
:set shelltemp " need temp files here
|
|
|
22c937 |
:au FilterReadPre *.out call rename(expand("<afile>"), expand("<afile>") . ".t")
|
|
|
22c937 |
! :au FilterReadPre *.out exe 'silent !sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>"))
|
|
|
22c937 |
! :au FilterReadPre *.out exe 'silent !rm ' . shellescape(expand("<afile>")) . '.t'
|
|
|
22c937 |
:au FilterReadPost *.out '[,']s/x/X/g
|
|
|
22c937 |
:e! test.out " Edit the output file
|
|
|
22c937 |
:23,$!cat
|
|
|
22c937 |
:23,$s/\r$// " remove CR for when sed adds them
|
|
|
22c937 |
! :au! FileReadPre *.gz exe 'silent !gzip -d ' . shellescape(expand("<afile>"))
|
|
|
22c937 |
:au FileReadPre *.gz call rename(expand("<afile>:r"), expand("<afile>"))
|
|
|
22c937 |
:au! FileReadPost *.gz '[,']s/l/L/
|
|
|
22c937 |
:$r Xtestfile.gz " Read compressed file
|
|
|
22c937 |
*** ../vim-7.4.469/src/testdir/test100.in 2014-08-16 17:34:31.186128463 +0200
|
|
|
22c937 |
--- src/testdir/test100.in 2014-10-09 15:27:44.404903381 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 16,22 ****
|
|
|
22c937 |
:new one
|
|
|
22c937 |
:0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
|
|
|
22c937 |
:call FillBuffer()
|
|
|
22c937 |
! :call feedkeys(":earlier 10\n", 't')
|
|
|
22c937 |
:call UndoLevel()
|
|
|
22c937 |
:set ff=unix
|
|
|
22c937 |
:%w! test.out
|
|
|
22c937 |
--- 16,22 ----
|
|
|
22c937 |
:new one
|
|
|
22c937 |
:0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
|
|
|
22c937 |
:call FillBuffer()
|
|
|
22c937 |
! :earlier 10
|
|
|
22c937 |
:call UndoLevel()
|
|
|
22c937 |
:set ff=unix
|
|
|
22c937 |
:%w! test.out
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 24,30 ****
|
|
|
22c937 |
:0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
|
|
|
22c937 |
:setlocal ul=2
|
|
|
22c937 |
:call FillBuffer()
|
|
|
22c937 |
! :call feedkeys(":earlier 10\n", 't')
|
|
|
22c937 |
:call UndoLevel()
|
|
|
22c937 |
:setlocal ul=10
|
|
|
22c937 |
:call UndoLevel()
|
|
|
22c937 |
--- 24,30 ----
|
|
|
22c937 |
:0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
|
|
|
22c937 |
:setlocal ul=2
|
|
|
22c937 |
:call FillBuffer()
|
|
|
22c937 |
! :earlier 10
|
|
|
22c937 |
:call UndoLevel()
|
|
|
22c937 |
:setlocal ul=10
|
|
|
22c937 |
:call UndoLevel()
|
|
|
22c937 |
*** ../vim-7.4.469/src/version.c 2014-10-09 14:48:26.284898230 +0200
|
|
|
22c937 |
--- src/version.c 2014-10-09 15:34:43.088904296 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 743,744 ****
|
|
|
22c937 |
--- 743,746 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 470,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
"Marriage is when a man and woman become as one; the trouble starts
|
|
|
22c937 |
when they try to decide which one"
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|