Mercurial > vim
annotate src/testdir/test_diffmode.vim @ 10062:103d874ebb96 v7.4.2302
commit https://github.com/vim/vim/commit/f1b512a0b62d0fa47ee9b2612556f375e1f22fc2
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 1 20:50:54 2016 +0200
patch 7.4.2302
Problem: Default interface versions for MS-Windows are outdated.
Solution: Use Active Perl 5.24, Python 3.5.2. Could only make it work with
Ruby 1.9.2.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 01 Sep 2016 21:00:08 +0200 |
parents | 4b4ba6589a98 |
children | d0b74b18e4b5 |
rev | line source |
---|---|
9694
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
1 " Tests for diff mode |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
2 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
3 func Test_diff_fold_sync() |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
4 enew! |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
5 let l = range(50) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
6 call setline(1, l) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
7 diffthis |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
8 let winone = win_getid() |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
9 new |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
10 let l[25] = 'diff' |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
11 call setline(1, l) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
12 diffthis |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
13 let wintwo = win_getid() |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
14 " line 15 is inside the closed fold |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
15 call assert_equal(19, foldclosedend(10)) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
16 call win_gotoid(winone) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
17 call assert_equal(19, foldclosedend(10)) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
18 " open the fold |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
19 normal zv |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
20 call assert_equal(-1, foldclosedend(10)) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
21 " fold in other window must have opened too |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
22 call win_gotoid(wintwo) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
23 call assert_equal(-1, foldclosedend(10)) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
24 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
25 " cursor position is in sync |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
26 normal 23G |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
27 call win_gotoid(winone) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
28 call assert_equal(23, getcurpos()[1]) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
29 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
30 windo diffoff |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
31 close! |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
32 set nomodified |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
33 endfunc |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
34 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
35 func Test_vert_split() |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
36 " Disable the title to avoid xterm keeping the wrong one. |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
37 set notitle noicon |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
38 new |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
39 let l = ['1 aa', '2 bb', '3 cc', '4 dd', '5 ee'] |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
40 call setline(1, l) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
41 w! Xtest |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
42 normal dd |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
43 $ |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
44 put |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
45 normal kkrXoxxx |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
46 w! Xtest2 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
47 file Nop |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
48 normal ggoyyyjjjozzzz |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
49 set foldmethod=marker foldcolumn=4 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
50 call assert_equal(0, &diff) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
51 call assert_equal('marker', &foldmethod) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
52 call assert_equal(4, &foldcolumn) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
53 call assert_equal(0, &scrollbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
54 call assert_equal(0, &cursorbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
55 call assert_equal(1, &wrap) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
56 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
57 vert diffsplit Xtest |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
58 vert diffsplit Xtest2 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
59 call assert_equal(1, &diff) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
60 call assert_equal('diff', &foldmethod) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
61 call assert_equal(2, &foldcolumn) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
62 call assert_equal(1, &scrollbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
63 call assert_equal(1, &cursorbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
64 call assert_equal(0, &wrap) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
65 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
66 let diff_fdm = &fdm |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
67 let diff_fdc = &fdc |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
68 " repeat entering diff mode here to see if this saves the wrong settings |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
69 diffthis |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
70 " jump to second window for a moment to have filler line appear at start of |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
71 " first window |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
72 wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
73 normal gg |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
74 wincmd p |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
75 normal gg |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
76 call assert_equal(2, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
77 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
78 call assert_equal(4, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
79 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
80 call assert_equal(5, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
81 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
82 call assert_equal(6, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
83 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
84 call assert_equal(8, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
85 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
86 call assert_equal(9, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
87 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
88 wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
89 normal gg |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
90 call assert_equal(1, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
91 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
92 call assert_equal(2, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
93 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
94 call assert_equal(4, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
95 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
96 call assert_equal(5, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
97 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
98 call assert_equal(8, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
99 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
100 wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
101 normal gg |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
102 call assert_equal(2, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
103 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
104 call assert_equal(3, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
105 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
106 call assert_equal(4, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
107 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
108 call assert_equal(5, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
109 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
110 call assert_equal(6, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
111 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
112 call assert_equal(7, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
113 normal j |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
114 call assert_equal(8, winline()) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
115 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
116 " Test diffoff |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
117 diffoff! |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
118 1wincmd 2 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
119 let &diff = 1 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
120 let &fdm = diff_fdm |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
121 let &fdc = diff_fdc |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
122 4wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
123 diffoff! |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
124 1wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
125 call assert_equal(0, &diff) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
126 call assert_equal('marker', &foldmethod) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
127 call assert_equal(4, &foldcolumn) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
128 call assert_equal(0, &scrollbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
129 call assert_equal(0, &cursorbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
130 call assert_equal(1, &wrap) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
131 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
132 wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
133 call assert_equal(0, &diff) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
134 call assert_equal('marker', &foldmethod) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
135 call assert_equal(4, &foldcolumn) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
136 call assert_equal(0, &scrollbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
137 call assert_equal(0, &cursorbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
138 call assert_equal(1, &wrap) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
139 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
140 wincmd w |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
141 call assert_equal(0, &diff) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
142 call assert_equal('marker', &foldmethod) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
143 call assert_equal(4, &foldcolumn) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
144 call assert_equal(0, &scrollbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
145 call assert_equal(0, &cursorbind) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
146 call assert_equal(1, &wrap) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
147 |
9696
103e79a0ad8d
commit https://github.com/vim/vim/commit/623cf88f9c5ad49cce8e846af29a1bb9346c7481
Christian Brabandt <cb@256bit.org>
parents:
9694
diff
changeset
|
148 call delete('Xtest') |
103e79a0ad8d
commit https://github.com/vim/vim/commit/623cf88f9c5ad49cce8e846af29a1bb9346c7481
Christian Brabandt <cb@256bit.org>
parents:
9694
diff
changeset
|
149 call delete('Xtest2') |
9694
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
150 windo bw! |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
151 endfunc |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
152 |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
153 func Test_filler_lines() |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
154 " Test that diffing shows correct filler lines |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
155 enew! |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
156 put =range(4,10) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
157 1d _ |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
158 vnew |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
159 put =range(1,10) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
160 1d _ |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
161 windo diffthis |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
162 wincmd h |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
163 call assert_equal(1, line('w0')) |
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
164 unlet! diff_fdm diff_fdc |
9701
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
165 windo diffoff |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
166 bwipe! |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
167 enew! |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
168 endfunc |
9694
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
169 |
9701
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
170 func Test_diffget_diffput() |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
171 enew! |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
172 let l = range(50) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
173 call setline(1, l) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
174 call assert_fails('diffget', 'E99:') |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
175 diffthis |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
176 call assert_fails('diffget', 'E100:') |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
177 new |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
178 let l[10] = 'one' |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
179 let l[20] = 'two' |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
180 let l[30] = 'three' |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
181 let l[40] = 'four' |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
182 call setline(1, l) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
183 diffthis |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
184 call assert_equal('one', getline(11)) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
185 11diffget |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
186 call assert_equal('10', getline(11)) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
187 21diffput |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
188 wincmd w |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
189 call assert_equal('two', getline(21)) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
190 normal 31Gdo |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
191 call assert_equal('three', getline(31)) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
192 call assert_equal('40', getline(41)) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
193 normal 41Gdp |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
194 wincmd w |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
195 call assert_equal('40', getline(41)) |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
196 new |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
197 diffthis |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
198 call assert_fails('diffget', 'E101:') |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
199 |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
200 windo diffoff |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
201 bwipe! |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
202 bwipe! |
172855211978
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Christian Brabandt <cb@256bit.org>
parents:
9696
diff
changeset
|
203 enew! |
9694
5e9f63a2ac5c
commit https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
204 endfunc |
10005
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
205 |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
206 func Test_diffoff() |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
207 enew! |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
208 call setline(1, ['Two', 'Three']) |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
209 let normattr = screenattr(1, 1) |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
210 diffthis |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
211 botright vert new |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
212 call setline(1, ['One', '', 'Two', 'Three']) |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
213 diffthis |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
214 redraw |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
215 diffoff! |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
216 redraw |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
217 call assert_equal(normattr, screenattr(1, 1)) |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
218 bwipe! |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
219 bwipe! |
4b4ba6589a98
commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents:
9701
diff
changeset
|
220 endfunc |