updated for version 7.2-133v7.2.133v7-2-133

2 files changed, 3 insertions, 1 deletions

diff --git a/src/diff.c b/src/diff.c
index c20d095d..34e78b6d 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1153,7 +1153,7 @@ ex_diffoff(eap)
 
     for (wp = firstwin; wp != NULL; wp = wp->w_next)
     {
-	if (wp == curwin || eap->forceit)
+	if (wp == curwin || (eap->forceit && wp->w_p_diff))
 	{
 	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */
 	    wp->w_p_diff = FALSE;
diff --git a/src/version.c b/src/version.c
index 4388cd20..bce02a7b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    133,
+/**/
     132,
 /**/
     131,