From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 17 Jul 2013 19:40:31 +0000 (+0200)
Subject: updated for version 7.4a.033
X-Git-Tag: v7.4a.033
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7a846d0e04e2b0131fe6374f1ccdae5c7266776;p=vim

updated for version 7.4a.033
Problem:    Test 98 always passes.
Solution:   Include test98a.in in test98.in, execute the crucial command in
            one line. (Yukihiro Nakadaira)
---

diff --git a/src/testdir/test98.in b/src/testdir/test98.in
index b316017dc..83ccba09e 100644
--- a/src/testdir/test98.in
+++ b/src/testdir/test98.in
@@ -1,7 +1,29 @@
 Test for 'scrollbind' causing an unexpected scroll of one of the windows.
 STARTTEST
 :so small.vim
-:source test98a.in
+:" 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')
diff --git a/src/testdir/test98a.in b/src/testdir/test98a.in
deleted file mode 100644
index df07a6c3f..000000000
--- a/src/testdir/test98a.in
+++ /dev/null
@@ -1,28 +0,0 @@
-" 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
diff --git a/src/version.c b/src/version.c
index 97ffa7828..2ac4f9884 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    33,
 /**/
     32,
 /**/