annotate src/testdir/test47.in @ 6829:56f553a0bff6

Added tag v7-4-735 for changeset 734c89ddf7b3
author Bram Moolenaar <bram@vim.org>
date Tue, 09 Jun 2015 20:30:51 +0200
parents 64427849c158
children cfd9a2befd67
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 Tests for vertical splits and filler lines in diff mode
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 STARTTEST
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 :so small.vim
2403
ce5a380d5144 Fix: when resetting both 'title' and 'icon' the title would be set after a
Bram Moolenaar <bram@vim.org>
parents: 1405
diff changeset
5 :" Disable the title to avoid xterm keeping the wrong one.
ce5a380d5144 Fix: when resetting both 'title' and 'icon' the title would be set after a
Bram Moolenaar <bram@vim.org>
parents: 1405
diff changeset
6 :set notitle noicon
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 /^1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 yG:new
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 pkdd:w! Xtest
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 ddGpkkrXoxxx:w! Xtest2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 :file Nop
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 ggoyyyjjjozzzz
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 :vert diffsplit Xtest
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 :vert diffsplit Xtest2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 :" jump to second window for a moment to have filler line appear at start of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 :" first window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 ggpgg:let one = winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 gg:let two = winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 gg:let three = winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 :call append("$", one)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 :call append("$", two)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 :call append("$", three)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 :$-2,$w! test.out
3904
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
39 :" Test that diffing shows correct filler lines
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
40 :diffoff!
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
41 :windo :bw!
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
42 :enew
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
43 :put =range(4,10)
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
44 :1d _
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
45 :vnew
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
46 :put =range(1,10)
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
47 :1d _
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
48 :windo :diffthis
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
49 :wincmd h
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
50 :let w0=line('w0')
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
51 :enew
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
52 :put =w0
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
53 :.w >> test.out
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
54 :unlet! one two three w0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 :qa!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 ENDTEST
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58 1 aa
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 2 bb
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60 3 cc
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 4 dd
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 5 ee