Mercurial > vim
diff 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 |
line wrap: on
line diff
--- a/src/testdir/test47.in +++ b/src/testdir/test47.in @@ -21,6 +21,10 @@ ggoyyyjjjozzzz :redir => diffsettings :silent! :set diff? fdm? fdc? scb? crb? wrap? :redir END +:let diff_fdm = &fdm +:let diff_fdc = &fdc +:" repeat entering diff mode here to see if this saves the wrong settings +:diffthis :" jump to second window for a moment to have filler line appear at start of :" first window ggpgg:let one = winline() @@ -48,6 +52,12 @@ j:let three = three . "-" . winline() :" :" Test diffoff :diffoff! +1 +:let &diff = 1 +:let &fdm = diff_fdm +:let &fdc = diff_fdc +4 +:diffoff! :$put =nodiffsettings :$put =diffsettings 1 @@ -82,7 +92,7 @@ 1 :enew :put =w0 :.w >> test.out -:unlet! one two three nodiffsettings diffsettings nd1 nd2 nd3 w0 +:unlet! one two three nodiffsettings diffsettings diff_fdm diff_fdc nd1 nd2 nd3 w0 :qa! ENDTEST