commit 21fa1ed4b517940d312994dcdd703cf6e20f152a
author Bram Moolenaar <Bram@vim.org> Wed Mar 11 11:47:18 2009 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Mar 11 11:47:18 2009 +0000
tree 8047214c0496381f7cfece1d8510bff3a9f1f846
parent bf1b7a7efeabc6161ce476ed82340e422c15eb09

updated for version 7.2-133

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index c20d095..34e78b6 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1153,7 +1153,7 @@
 
     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;

src/version.c

diff --git a/src/version.c b/src/version.c
index 4388cd2..bce02a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    133,
+/**/
     132,
 /**/
     131,