| Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1 | Tests for vertical splits and filler lines in diff mode |
| 2 | |
| Bram Moolenaar | 2693ca2 | 2015-07-04 15:05:14 +0200 | [diff] [blame] | 3 | Also tests restoration of saved options by :diffoff. |
| 4 | |
| Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 5 | STARTTEST |
| 6 | :so small.vim |
| Bram Moolenaar | bed7bec | 2010-07-25 13:42:29 +0200 | [diff] [blame] | 7 | :" Disable the title to avoid xterm keeping the wrong one. |
| 8 | :set notitle noicon |
| Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 9 | /^1 |
| 10 | yG:new |
| 11 | pkdd:w! Xtest |
| 12 | ddGpkkrXoxxx:w! Xtest2 |
| 13 | :file Nop |
| 14 | ggoyyyjjjozzzz |
| Bram Moolenaar | 2693ca2 | 2015-07-04 15:05:14 +0200 | [diff] [blame] | 15 | :set foldmethod=marker foldcolumn=4 |
| 16 | :redir => nodiffsettings |
| 17 | :silent! :set diff? fdm? fdc? scb? crb? wrap? |
| 18 | :redir END |
| Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 19 | :vert diffsplit Xtest |
| 20 | :vert diffsplit Xtest2 |
| Bram Moolenaar | 2693ca2 | 2015-07-04 15:05:14 +0200 | [diff] [blame] | 21 | :redir => diffsettings |
| 22 | :silent! :set diff? fdm? fdc? scb? crb? wrap? |
| 23 | :redir END |
| Bram Moolenaar | 2782360 | 2015-07-28 14:42:45 +0200 | [diff] [blame] | 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 |
| Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 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 |
| Bram Moolenaar | 2693ca2 | 2015-07-04 15:05:14 +0200 | [diff] [blame] | 52 | :" |
| 53 | :" Test diffoff |
| Bram Moolenaar | a80888d | 2012-10-21 22:18:21 +0200 | [diff] [blame] | 54 | :diffoff! |
| Bram Moolenaar | 2782360 | 2015-07-28 14:42:45 +0200 | [diff] [blame] | 55 | 1 |
| 56 | :let &diff = 1 |
| 57 | :let &fdm = diff_fdm |
| 58 | :let &fdc = diff_fdc |
| 59 | 4 |
| 60 | :diffoff! |
| Bram Moolenaar | 2693ca2 | 2015-07-04 15:05:14 +0200 | [diff] [blame] | 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 | :" |
| 81 | :" Test that diffing shows correct filler lines |
| Bram Moolenaar | a80888d | 2012-10-21 22:18:21 +0200 | [diff] [blame] | 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 |
| Bram Moolenaar | 2782360 | 2015-07-28 14:42:45 +0200 | [diff] [blame] | 95 | :unlet! one two three nodiffsettings diffsettings diff_fdm diff_fdc nd1 nd2 nd3 w0 |
| Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 96 | :qa! |
| 97 | ENDTEST |
| 98 | |
| 99 | 1 aa |
| 100 | 2 bb |
| 101 | 3 cc |
| 102 | 4 dd |
| 103 | 5 ee |