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 | 7b8095efd73c419b7390de8a68a472313f9d3894 (patch) | |
tree | 81f0671dcf6e7b38c514748bbb92f4717733d45d | |
parent | f196ef5b2351e97e1972d19bdf1350b59957a07b (diff) | |
download | vim-7b8095efd73c419b7390de8a68a472313f9d3894.tar.gz |
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
@@ -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 272940af..b07e2696 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, |