From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 20 Sep 2013 18:13:53 +0000 (+0200)
Subject: updated for version 7.4.031
X-Git-Tag: v7.4.031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00462ffb7d0fc6448eb5d10681ef4e1f812c7310;p=vim

updated for version 7.4.031
Problem:    ":diffoff!" resets options even when 'diff' is not set. (Charles
            Cooper)
Solution:   Only resets related options in a window where 'diff' is set.
---

diff --git a/src/diff.c b/src/diff.c
index 80f447314..49ca58af7 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1203,7 +1203,7 @@ ex_diffoff(eap)
 
     for (wp = firstwin; wp != NULL; wp = wp->w_next)
     {
-	if (wp == curwin || (eap->forceit && wp->w_p_diff))
+	if (eap->forceit ? wp->w_p_diff : wp == curwin)
 	{
 	    /* Set 'diff', 'scrollbind' off and 'wrap' on. If option values
 	     * were saved in diff_win_options() restore them. */
diff --git a/src/version.c b/src/version.c
index 272940af8..b07e26962 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    31,
 /**/
     30,
 /**/