From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 11 Mar 2009 11:47:18 +0000 (+0000)
Subject: updated for version 7.2-133
X-Git-Tag: v7.2.133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21fa1ed4b517940d312994dcdd703cf6e20f152a;p=vim

updated for version 7.2-133
---

diff --git a/src/diff.c b/src/diff.c
index c20d095d5..34e78b6db 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 4388cd201..bce02a7b7 100644
--- 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,
 /**/