To: [email protected]
Subject: Patch 7.4a.033
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4a.033
Problem:    Test 98 always passes.
Solution:   Include test98a.in in test98.in, execute the crucial command in
           one line. (Yukihiro Nakadaira)
Files:      src/testdir/test98.in, src/testdir/test98a.in


*** ../vim-7.4a.032/src/testdir/test98.in       2013-07-09 13:44:40.000000000 +0200
--- src/testdir/test98.in       2013-07-17 21:35:40.000000000 +0200
***************
*** 1,7 ****
 Test for 'scrollbind' causing an unexpected scroll of one of the windows.
 STARTTEST
 :so small.vim
! :source test98a.in
 :let topLineLeft = line('w0')
 :wincmd p
 :let topLineRight = line('w0')
--- 1,29 ----
 Test for 'scrollbind' causing an unexpected scroll of one of the windows.
 STARTTEST
 :so small.vim
! :" We don't want the status line to cause problems:
! :set laststatus=0
! :let g:totalLines = &lines * 20
! :let middle = g:totalLines / 2
! :wincmd n
! :wincmd o
! :for i in range(1, g:totalLines)
! :    call setline(i, 'LINE ' . i)
! :endfor
! :exe string(middle)
! :normal zt
! :normal M
! :aboveleft vert new
! :for i in range(1, g:totalLines)
! :    call setline(i, 'line ' . i)
! :endfor
! :exe string(middle)
! :normal zt
! :normal M
! :" Execute the following two command at once to reproduce the problem.
! :setl scb | wincmd p
! :setl scb
! :wincmd w
 :let topLineLeft = line('w0')
 :wincmd p
 :let topLineRight = line('w0')
*** ../vim-7.4a.032/src/testdir/test98a.in      2013-07-14 13:02:06.000000000 +0200
--- src/testdir/test98a.in      1970-01-01 01:00:00.000000000 +0100
***************
*** 1,28 ****
- " We don't want the status line to cause problems:
- set laststatus=0
- redraw!
- let g:totalLines = &lines * 20
- let middle = g:totalLines / 2
- wincmd n
- wincmd o
- for i in range(1, g:totalLines)
-       call setline(i, 'LINE ' . i)
- endfor
-
- exe string(middle)
- normal zt
- normal M
-
- aboveleft vert new
- for i in range(1, g:totalLines)
-       call setline(i, 'line ' . i)
- endfor
- exe string(middle)
- normal zt
- normal M
- setl scb
-
- wincmd p
-
- setl scb
- wincmd w
--- 0 ----
*** ../vim-7.4a.032/src/version.c       2013-07-17 21:10:47.000000000 +0200
--- src/version.c       2013-07-17 21:38:19.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
 {   /* Add new patch number below this line */
+ /**/
+     33,
 /**/

--
Normal people believe that if it ain't broke, don't fix it.  Engineers believe
that if it ain't broke, it doesn't have enough features yet.
                               (Scott Adams - The Dilbert principle)

/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
\\\            help me help AIDS victims -- http://ICCF-Holland.org    ///