diff options
| -rw-r--r-- | src/nvim/testdir/test47.in | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/nvim/testdir/test47.in b/src/nvim/testdir/test47.in index 16d2336812..f15eaf0f8f 100644 --- a/src/nvim/testdir/test47.in +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index b28d5706c8..425c71d0b3 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -487,7 +487,7 @@ static int included_patches[] = { // 804, 803, 802, - // 801, + 801, // 800, 799, // 798, |