annotate src/testdir/test47.in @ 9452:6d5c24b8dc0e v7.4.2007

commit https://github.com/vim/vim/commit/fc4ad616073a169badfb2b9906fee2844f76f730 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 9 15:38:32 2016 +0200 patch 7.4.2007 Problem: Running the tests leaves a viminfo file behind. Solution: Make the viminfo option empty.
author Christian Brabandt <cb@256bit.org>
date Sat, 09 Jul 2016 15:45:07 +0200
parents 20ed78fab428
children
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
6899
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
3 Also tests restoration of saved options by :diffoff.
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
4
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 STARTTEST
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 :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
7 :" 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
8 :set notitle noicon
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 /^1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 yG:new
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 pkdd:w! Xtest
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 ddGpkkrXoxxx:w! Xtest2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 :file Nop
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 ggoyyyjjjozzzz
6899
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
15 :set foldmethod=marker foldcolumn=4
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
16 :redir => nodiffsettings
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
17 :silent! :set diff? fdm? fdc? scb? crb? wrap?
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
18 :redir END
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 :vert diffsplit Xtest
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 :vert diffsplit Xtest2
6899
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
21 :redir => diffsettings
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
22 :silent! :set diff? fdm? fdc? scb? crb? wrap?
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
23 :redir END
6967
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
24 :let diff_fdm = &fdm
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
25 :let diff_fdc = &fdc
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
26 :" repeat entering diff mode here to see if this saves the wrong settings
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
27 :diffthis
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 :" 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
29 :" first window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 ggpgg:let one = winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 j:let one = one . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 gg:let two = winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 j:let two = two . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 gg:let three = winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 j:let three = three . "-" . winline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 :call append("$", one)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 :call append("$", two)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 :call append("$", three)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51 :$-2,$w! test.out
6899
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
52 :"
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
53 :" Test diffoff
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
54 :diffoff!
6967
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
55 1
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
56 :let &diff = 1
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
57 :let &fdm = diff_fdm
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
58 :let &fdc = diff_fdc
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
59 4
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
60 :diffoff!
6899
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
61 :$put =nodiffsettings
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
62 :$put =diffsettings
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
63 1
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
64 :redir => nd1
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
65 :silent! :set diff? fdm? fdc? scb? crb? wrap?
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
66 :redir END
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
67 
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
68 :redir => nd2
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
69 :silent! :set diff? fdm? fdc? scb? crb? wrap?
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
70 :redir END
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
71 
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
72 :redir => nd3
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
73 :silent! :set diff? fdm? fdc? scb? crb? wrap?
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
74 :redir END
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
75 
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
76 :$put =nd1
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
77 :$put =nd2
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
78 :$put =nd3
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
79 :$-39,$w >> test.out
cfd9a2befd67 patch 7.4.769
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
80 :"
3904
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
81 :" Test that diffing shows correct filler lines
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
82 :windo :bw!
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
83 :enew
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
84 :put =range(4,10)
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
85 :1d _
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
86 :vnew
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
87 :put =range(1,10)
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
88 :1d _
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
89 :windo :diffthis
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
90 :wincmd h
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
91 :let w0=line('w0')
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
92 :enew
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
93 :put =w0
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 2403
diff changeset
94 :.w >> test.out
6967
20ed78fab428 patch 7.4.801
Bram Moolenaar <bram@vim.org>
parents: 6899
diff changeset
95 :unlet! one two three nodiffsettings diffsettings diff_fdm diff_fdc nd1 nd2 nd3 w0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 :qa!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97 ENDTEST
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99 1 aa
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
100 2 bb
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
101 3 cc
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
102 4 dd
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
103 5 ee