diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-17 21:40:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-17 21:40:31 +0200 |
| commit | b7a846d0e04e2b0131fe6374f1ccdae5c7266776 (patch) | |
| tree | 12f2d8092f6ead618a2ff0383cac511926b95ea7 | |
| parent | 69b52456fcf68da22b2f144ca709c21eef7f5832 (diff) | |
updated for version 7.4a.033v7.4a.033
Problem: Test 98 always passes.
Solution: Include test98a.in in test98.in, execute the crucial command in
one line. (Yukihiro Nakadaira)
| -rw-r--r-- | src/testdir/test98.in | 24 | ||||
| -rw-r--r-- | src/testdir/test98a.in | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 25 insertions, 29 deletions
diff --git a/src/testdir/test98.in b/src/testdir/test98.in index b316017dc4..83ccba09e9 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 df07a6c3fa..0000000000 --- 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 97ffa7828d..2ac4f98849 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 33, +/**/ 32, /**/ 31, |