Mercurial > vim

comparison src/testdir/test47.in @ 6967:20ed78fab428 v7.4.801

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6966:f215170a8a03 6967:20ed78fab428
19 :vert diffsplit Xtest 19 :vert diffsplit Xtest
20 :vert diffsplit Xtest2 20 :vert diffsplit Xtest2
21 :redir => diffsettings 21 :redir => diffsettings
22 :silent! :set diff? fdm? fdc? scb? crb? wrap? 22 :silent! :set diff? fdm? fdc? scb? crb? wrap?
23 :redir END 23 :redir END
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
24 :" jump to second window for a moment to have filler line appear at start of 28 :" jump to second window for a moment to have filler line appear at start of
25 :" first window 29 :" first window
26 ggpgg:let one = winline() 30 ggpgg:let one = winline()
27 j:let one = one . "-" . winline() 31 j:let one = one . "-" . winline()
28 j:let one = one . "-" . winline() 32 j:let one = one . "-" . winline()
45 :call append("$", two) 49 :call append("$", two)
46 :call append("$", three) 50 :call append("$", three)
47 :$-2,$w! test.out 51 :$-2,$w! test.out
48 :" 52 :"
49 :" Test diffoff 53 :" Test diffoff
54 :diffoff!
55 1
56 :let &diff = 1
57 :let &fdm = diff_fdm
58 :let &fdc = diff_fdc
59 4
50 :diffoff! 60 :diffoff!
51 :$put =nodiffsettings 61 :$put =nodiffsettings
52 :$put =diffsettings 62 :$put =diffsettings
53 1 63 1
54 :redir => nd1 64 :redir => nd1
80 :wincmd h 90 :wincmd h
81 :let w0=line('w0') 91 :let w0=line('w0')
82 :enew 92 :enew
83 :put =w0 93 :put =w0
84 :.w >> test.out 94 :.w >> test.out
85 :unlet! one two three nodiffsettings diffsettings nd1 nd2 nd3 w0 95 :unlet! one two three nodiffsettings diffsettings diff_fdm diff_fdc nd1 nd2 nd3 w0
86 :qa! 96 :qa!
87 ENDTEST 97 ENDTEST
88 98
89 1 aa 99 1 aa
90 2 bb 100 2 bb