diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-07-28 14:42:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-07-28 14:42:45 +0200 |
| commit | e5bf4fa87bfb1ffc646545999a024ec77ebe923d (patch) | |
| tree | 1db3febb56b2626a4c68fbf9542bf7c05cc7e34e /src | |
| parent | eba193296a3c9964f81ad325bc5ec2256171e9fb (diff) | |
| download | vim-e5bf4fa87bfb1ffc646545999a024ec77ebe923d.tar.gz | |
Problem: Test for ":diffoff" doesn't catch all potential problems.
Solution: Add a :diffthis and a :diffoff command. (Olaf Dabrunz)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test47.in | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/testdir/test47.in b/src/testdir/test47.in index 16d23368..f15eaf0f 100644 --- 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 @@ j:let three = three . "-" . winline() :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 diff --git a/src/version.c b/src/version.c index cf4d74ae..12ddab28 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 801, +/**/ 800, /**/ 799, |