updated for version 7.2-133

diff --git a/src/diff.c b/src/diff.c
index c20d095d51dc342113f848eb13bfc6283cda2858..34e78b6db9c092955d93ca0e4e6cd92f1012a1bb 100644 (file)
--- 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 4388cd2013a337fd7f41c483c8aa9b16beef8544..bce02a7b725bebb623d3de34db334a5bf793b348 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
 /**/
     132,
 /**/