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 16d2336812e53a3ce0e253635d51cdfe8de97126..f15eaf0f8f366287962f8469289a4ecf83271e5f 100644 (file)
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -21,6 +21,10 @@ ggoyyy\ejjjozzzz\e
 :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
 \17\17gg\17pgg:let one = winline()
@@ -48,6 +52,12 @@ j:let three = three . "-" . winline()
 :"
 :" Test diffoff
 :diffoff!
+1\17\17
+:let &diff = 1
+:let &fdm = diff_fdm
+:let &fdc = diff_fdc
+4\17\17
+:diffoff!
 :$put =nodiffsettings
 :$put =diffsettings
 1\17\17
@@ -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 cf4d74ae3cef1858bd3abf5567e75cba19f6ff0d..12ddab28fa35749375479c0ea3f4b32f9889ccb5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    801,
 /**/
     800,
 /**/