patch 7.4.801
Problem: Test for ":diffoff" doesn't catch all potential problems.
Solution: Add a :diffthis and a :diffoff command. (Olaf Dabrunz)
diff --git a/src/testdir/test47.in b/src/testdir/test47.in
index 16d2336..f15eaf0 100644
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -21,6 +21,10 @@
: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 @@
:"
:" 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 @@
: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 cf4d74a..12ddab2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 801,
+/**/
800,
/**/
799,