|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.315
|
|
|
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.315 (after 7.4.309)
|
|
|
22c937 |
Problem: Fixes for computation of topline not tested.
|
|
|
22c937 |
Solution: Add test. (Hirohito Higashi)
|
|
|
22c937 |
Files: src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|
|
22c937 |
src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
|
|
|
22c937 |
src/testdir/Make_vms.mms, src/testdir/Makefile,
|
|
|
22c937 |
src/testdir/test107.in, src/testdir/test107.ok
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/Make_amiga.mak 2014-04-29 12:15:22.852032651 +0200
|
|
|
22c937 |
--- src/testdir/Make_amiga.mak 2014-05-28 13:13:32.108062709 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 35,41 ****
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
22c937 |
! test104.out test105.out test106.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
--- 35,41 ----
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
22c937 |
! test104.out test105.out test106.out test107.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 161,166 ****
|
|
|
22c937 |
--- 161,167 ----
|
|
|
22c937 |
test104.out: test104.in
|
|
|
22c937 |
test105.out: test105.in
|
|
|
22c937 |
test106.out: test106.in
|
|
|
22c937 |
+ test107.out: test107.in
|
|
|
22c937 |
test_autoformat_join.out: test_autoformat_join.in
|
|
|
22c937 |
test_eval.out: test_eval.in
|
|
|
22c937 |
test_options.out: test_options.in
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/Make_dos.mak 2014-04-29 12:15:22.852032651 +0200
|
|
|
22c937 |
--- src/testdir/Make_dos.mak 2014-05-28 13:13:44.344062816 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 34,40 ****
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
--- 34,40 ----
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out test107.out\
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/Make_ming.mak 2014-04-29 12:15:22.852032651 +0200
|
|
|
22c937 |
--- src/testdir/Make_ming.mak 2014-05-28 13:13:52.656062889 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 54,60 ****
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
--- 54,60 ----
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out test107.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/Make_os2.mak 2014-04-29 12:15:22.852032651 +0200
|
|
|
22c937 |
--- src/testdir/Make_os2.mak 2014-05-28 13:14:03.616062985 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 36,42 ****
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
--- 36,42 ----
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out test107.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/Make_vms.mms 2014-04-29 12:15:22.852032651 +0200
|
|
|
22c937 |
--- src/testdir/Make_vms.mms 2014-05-28 13:14:09.724063038 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 4,10 ****
|
|
|
22c937 |
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
|
|
22c937 |
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
|
|
22c937 |
#
|
|
|
22c937 |
! # Last change: 2014 Mar 12
|
|
|
22c937 |
#
|
|
|
22c937 |
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
|
|
22c937 |
# Edit the lines in the Configuration section below to select.
|
|
|
22c937 |
--- 4,10 ----
|
|
|
22c937 |
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
|
|
22c937 |
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
|
|
22c937 |
#
|
|
|
22c937 |
! # Last change: 2014 May 28
|
|
|
22c937 |
#
|
|
|
22c937 |
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
|
|
22c937 |
# Edit the lines in the Configuration section below to select.
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 95,101 ****
|
|
|
22c937 |
test90.out test91.out test92.out test93.out test94.out \
|
|
|
22c937 |
test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
--- 95,101 ----
|
|
|
22c937 |
test90.out test91.out test92.out test93.out test94.out \
|
|
|
22c937 |
test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
test100.out test101.out test103.out test104.out \
|
|
|
22c937 |
! test105.out test106.out test107.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/Makefile 2014-05-22 13:12:25.650592983 +0200
|
|
|
22c937 |
--- src/testdir/Makefile 2014-05-28 13:14:28.688063204 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 32,38 ****
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
22c937 |
! test104.out test105.out test106.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
--- 32,38 ----
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
22c937 |
! test104.out test105.out test106.out test107.out \
|
|
|
22c937 |
test_autoformat_join.out \
|
|
|
22c937 |
test_eval.out \
|
|
|
22c937 |
test_options.out
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/test107.in 2014-05-29 11:46:48.728773486 +0200
|
|
|
22c937 |
--- src/testdir/test107.in 2014-05-29 11:40:20.096770084 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 0 ****
|
|
|
22c937 |
--- 1,38 ----
|
|
|
22c937 |
+ Tests for adjusting window and contents vim: set ft=vim :
|
|
|
22c937 |
+
|
|
|
22c937 |
+ STARTTEST
|
|
|
22c937 |
+ :so small.vim
|
|
|
22c937 |
+ :new
|
|
|
22c937 |
+ :call setline(1, range(1,256))
|
|
|
22c937 |
+ :let r=[]
|
|
|
22c937 |
+ :func! GetScreenStr(row)
|
|
|
22c937 |
+ : let str = ""
|
|
|
22c937 |
+ : for c in range(1,3)
|
|
|
22c937 |
+ : let str .= nr2char(screenchar(a:row, c))
|
|
|
22c937 |
+ : endfor
|
|
|
22c937 |
+ : return str
|
|
|
22c937 |
+ :endfunc
|
|
|
22c937 |
+ :
|
|
|
22c937 |
+ :exe ":norm! \<C-W>t\<C-W>=1Gzt\<C-W>w\<C-W>+"
|
|
|
22c937 |
+ :let s3=GetScreenStr(1)
|
|
|
22c937 |
+ :wincmd p
|
|
|
22c937 |
+ :call add(r, [line("w0"), s3])
|
|
|
22c937 |
+ :
|
|
|
22c937 |
+ :exe ":norm! \<C-W>t\<C-W>=50Gzt\<C-W>w\<C-W>+"
|
|
|
22c937 |
+ :let s3=GetScreenStr(1)
|
|
|
22c937 |
+ :wincmd p
|
|
|
22c937 |
+ :call add(r, [line("w0"), s3])
|
|
|
22c937 |
+ :
|
|
|
22c937 |
+ :exe ":norm! \<C-W>t\<C-W>=59Gzt\<C-W>w\<C-W>+"
|
|
|
22c937 |
+ :let s3=GetScreenStr(1)
|
|
|
22c937 |
+ ::wincmd p
|
|
|
22c937 |
+ :call add(r, [line("w0"), s3])
|
|
|
22c937 |
+ :
|
|
|
22c937 |
+ :bwipeout!
|
|
|
22c937 |
+ :$put=r
|
|
|
22c937 |
+ :call garbagecollect(1)
|
|
|
22c937 |
+ :"
|
|
|
22c937 |
+ :/^start:/,$wq! test.out
|
|
|
22c937 |
+ ENDTEST
|
|
|
22c937 |
+
|
|
|
22c937 |
+ start:
|
|
|
22c937 |
*** ../vim-7.4.314/src/testdir/test107.ok 2014-05-29 11:46:48.736773486 +0200
|
|
|
22c937 |
--- src/testdir/test107.ok 2014-05-29 11:40:20.096770084 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 0 ****
|
|
|
22c937 |
--- 1,4 ----
|
|
|
22c937 |
+ start:
|
|
|
22c937 |
+ [1, '1 ']
|
|
|
22c937 |
+ [50, '50 ']
|
|
|
22c937 |
+ [59, '59 ']
|
|
|
22c937 |
*** ../vim-7.4.314/src/version.c 2014-05-28 21:40:47.092329130 +0200
|
|
|
22c937 |
--- src/version.c 2014-05-29 11:41:47.640770850 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 736,737 ****
|
|
|
22c937 |
--- 736,739 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 315,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
hundred-and-one symptoms of being an internet addict:
|
|
|
22c937 |
229. You spend so much time thinking what to add on this list.
|
|
|
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 ///
|