Mercurial > vim
annotate src/testdir/test47.in @ 6967:20ed78fab428 v7.4.801
patch 7.4.801
Problem: Test for ":diffoff" doesn't catch all potential problems.
Solution: Add a :diffthis and a :diffoff command. (Olaf Dabrunz)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 28 Jul 2015 14:42:45 +0200 |
| parents | cfd9a2befd67 |
| children |
| rev | line source |
|---|---|
| 7 | 1 Tests for vertical splits and filler lines in diff mode |
| 2 | |
| 6899 | 3 Also tests restoration of saved options by :diffoff. |
| 4 | |
| 7 | 5 STARTTEST |
| 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 | 9 /^1 |
| 10 yG:new | |
| 11 pkdd:w! Xtest | |
| 12 ddGpkkrXoxxx:w! Xtest2 | |
| 13 :file Nop | |
| 14 ggoyyyjjjozzzz | |
| 6899 | 15 :set foldmethod=marker foldcolumn=4 |
| 16 :redir => nodiffsettings | |
| 17 :silent! :set diff? fdm? fdc? scb? crb? wrap? | |
| 18 :redir END | |
| 7 | 19 :vert diffsplit Xtest |
| 20 :vert diffsplit Xtest2 | |
| 6899 | 21 :redir => diffsettings |
| 22 :silent! :set diff? fdm? fdc? scb? crb? wrap? | |
| 23 :redir END | |
| 6967 | 24 :let diff_fdm = &fdm |
| 25 :let diff_fdc = &fdc | |
| 26 :" repeat entering diff mode here to see if this saves the wrong settings | |
| 27 :diffthis | |
| 7 | 28 :" jump to second window for a moment to have filler line appear at start of |
| 29 :" first window | |
| 30 ggpgg:let one = winline() | |
| 31 j:let one = one . "-" . winline() | |
| 32 j:let one = one . "-" . winline() | |
| 33 j:let one = one . "-" . winline() | |
| 34 j:let one = one . "-" . winline() | |
| 35 j:let one = one . "-" . winline() | |
| 36 gg:let two = winline() | |
| 37 j:let two = two . "-" . winline() | |
| 38 j:let two = two . "-" . winline() | |
| 39 j:let two = two . "-" . winline() | |
| 40 j:let two = two . "-" . winline() | |
| 41 gg:let three = winline() | |
| 42 j:let three = three . "-" . winline() | |
| 43 j:let three = three . "-" . winline() | |
| 44 j:let three = three . "-" . winline() | |
| 45 j:let three = three . "-" . winline() | |
| 46 j:let three = three . "-" . winline() | |
| 47 j:let three = three . "-" . winline() | |
| 48 :call append("$", one) | |
| 49 :call append("$", two) | |
| 50 :call append("$", three) | |
| 51 :$-2,$w! test.out | |
| 6899 | 52 :" |
| 53 :" Test diffoff | |
| 54 :diffoff! | |
| 6967 | 55 1 |
| 56 :let &diff = 1 | |
| 57 :let &fdm = diff_fdm | |
| 58 :let &fdc = diff_fdc | |
| 59 4 | |
| 60 :diffoff! | |
| 6899 | 61 :$put =nodiffsettings |
| 62 :$put =diffsettings | |
| 63 1 | |
| 64 :redir => nd1 | |
| 65 :silent! :set diff? fdm? fdc? scb? crb? wrap? | |
| 66 :redir END | |
| 67 | |
| 68 :redir => nd2 | |
| 69 :silent! :set diff? fdm? fdc? scb? crb? wrap? | |
| 70 :redir END | |
| 71 | |
| 72 :redir => nd3 | |
| 73 :silent! :set diff? fdm? fdc? scb? crb? wrap? | |
| 74 :redir END | |
| 75 | |
| 76 :$put =nd1 | |
| 77 :$put =nd2 | |
| 78 :$put =nd3 | |
| 79 :$-39,$w >> test.out | |
| 80 :" | |
| 3904 | 81 :" Test that diffing shows correct filler lines |
| 82 :windo :bw! | |
| 83 :enew | |
| 84 :put =range(4,10) | |
| 85 :1d _ | |
| 86 :vnew | |
| 87 :put =range(1,10) | |
| 88 :1d _ | |
| 89 :windo :diffthis | |
| 90 :wincmd h | |
| 91 :let w0=line('w0') | |
| 92 :enew | |
| 93 :put =w0 | |
| 94 :.w >> test.out | |
| 6967 | 95 :unlet! one two three nodiffsettings diffsettings diff_fdm diff_fdc nd1 nd2 nd3 w0 |
| 7 | 96 :qa! |
| 97 ENDTEST | |
| 98 | |
| 99 1 aa | |
| 100 2 bb | |
| 101 3 cc | |
| 102 4 dd | |
| 103 5 ee |