From 00462ffb7d0fc6448eb5d10681ef4e1f812c7310 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 20 Sep 2013 20:13:53 +0200 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/diff.c') 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. */ -- cgit v1.2.1