diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-09-20 20:13:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-09-20 20:13:53 +0200 |
| commit | 00462ffb7d0fc6448eb5d10681ef4e1f812c7310 (patch) | |
| tree | c832db47e0da2f0db9e678c5911b900eebdcf408 | |
| parent | 9952c102dd66e14101b1abbe6510dde973f96945 (diff) | |
updated for version 7.4.031v7.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.
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c index 80f4473144..49ca58af7c 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 272940af8d..b07e26962b 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 31, +/**/ 30, /**/ 29, |