commit 00462ffb7d0fc6448eb5d10681ef4e1f812c7310
author Bram Moolenaar <Bram@vim.org> Fri Sep 20 20:13:53 2013 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 20 20:13:53 2013 +0200
tree c832db47e0da2f0db9e678c5911b900eebdcf408
parent 9952c102dd66e14101b1abbe6510dde973f96945

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.

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index 80f4473..49ca58a 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1203,7 +1203,7 @@
 
     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. */