summaryrefslogtreecommitdiff
path: root/src/diff.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-03-11 11:47:18 +0000
committerBram Moolenaar <Bram@vim.org>2009-03-11 11:47:18 +0000
commit21fa1ed4b517940d312994dcdd703cf6e20f152a (patch)
tree8047214c0496381f7cfece1d8510bff3a9f1f846 /src/diff.c
parentbf1b7a7efeabc6161ce476ed82340e422c15eb09 (diff)
downloadvim-git-21fa1ed4b517940d312994dcdd703cf6e20f152a.tar.gz
updated for version 7.2-133v7.2.133
Diffstat (limited to 'src/diff.c')
-rw-r--r--src/diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c
index c20d095d5..34e78b6db 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1153,7 +1153,7 @@ ex_diffoff(eap)
for (wp = firstwin; wp != NULL; wp = wp->w_next)
{
- if (wp == curwin || eap->forceit)
+ if (wp == curwin || (eap->forceit && wp->w_p_diff))
{
/* Set 'diff', 'scrollbind' off and 'wrap' on. */
wp->w_p_diff = FALSE;