patch 7.4.769v7.4.769

Problem:    Behavior of :diffoff is not tested.
Solution:   Add a bit of testing. (Olaf Dabrunz)

3 files changed, 75 insertions, 2 deletions

diff --git a/src/testdir/test47.in b/src/testdir/test47.in
index 13ad82462f..16d2336812 100644
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -1,5 +1,7 @@
 Tests for vertical splits and filler lines in diff mode
 
+Also tests restoration of saved options by :diffoff.
+
 STARTTEST
 :so small.vim
 :" Disable the title to avoid xterm keeping the wrong one.
@@ -10,8 +12,15 @@ pkdd:w! Xtest
 ddGpkkrXoxxx:w! Xtest2
 :file Nop
 ggoyyyjjjozzzz
+:set foldmethod=marker foldcolumn=4
+:redir => nodiffsettings
+:silent! :set diff? fdm? fdc? scb? crb? wrap?
+:redir END
 :vert diffsplit Xtest
 :vert diffsplit Xtest2
+:redir => diffsettings
+:silent! :set diff? fdm? fdc? scb? crb? wrap?
+:redir END
 :" jump to second window for a moment to have filler line appear at start of
 :" first window
 ggpgg:let one = winline()
@@ -36,8 +45,30 @@ j:let three = three . "-" . winline()
 :call append("$", two)
 :call append("$", three)
 :$-2,$w! test.out
-:" Test that diffing shows correct filler lines
+:"
+:" Test diffoff
 :diffoff!
+:$put =nodiffsettings
+:$put =diffsettings
+1
+:redir => nd1
+:silent! :set diff? fdm? fdc? scb? crb? wrap?
+:redir END
+
+:redir => nd2
+:silent! :set diff? fdm? fdc? scb? crb? wrap?
+:redir END
+
+:redir => nd3
+:silent! :set diff? fdm? fdc? scb? crb? wrap?
+:redir END
+
+:$put =nd1
+:$put =nd2
+:$put =nd3
+:$-39,$w >> test.out
+:"
+:" Test that diffing shows correct filler lines
 :windo :bw!
 :enew
 :put =range(4,10)
@@ -51,7 +82,7 @@ j:let three = three . "-" . winline()
 :enew
 :put =w0
 :.w >> test.out
-:unlet! one two three w0
+:unlet! one two three nodiffsettings diffsettings nd1 nd2 nd3 w0
 :qa!
 ENDTEST
 
diff --git a/src/testdir/test47.ok b/src/testdir/test47.ok
index b1cba92b1c..83e96571ad 100644
--- a/src/testdir/test47.ok
+++ b/src/testdir/test47.ok
@@ -1,4 +1,44 @@
 2-4-5-6-8-9
 1-2-4-5-8
 2-3-4-5-6-7-8
+
+
+nodiff
+  foldmethod=marker
+  foldcolumn=4
+noscrollbind
+nocursorbind
+  wrap
+
+
+  diff
+  foldmethod=diff
+  foldcolumn=2
+  scrollbind
+  cursorbind
+nowrap
+
+
+nodiff
+  foldmethod=marker
+  foldcolumn=4
+noscrollbind
+nocursorbind
+  wrap
+
+
+nodiff
+  foldmethod=marker
+  foldcolumn=4
+noscrollbind
+nocursorbind
+  wrap
+
+
+nodiff
+  foldmethod=marker
+  foldcolumn=4
+noscrollbind
+nocursorbind
+  wrap
 1
diff --git a/src/version.c b/src/version.c
index 047fd1226f..cd2604875e 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 */
 /**/
+    769,
+/**/
     768,
 /**/
     767,