diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-09-21 16:56:35 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-09-21 16:56:35 +0200 |
| commit | 3368ea215249b08ebaf64247f7a4f542fb6ba060 (patch) | |
| tree | 5ea97ed3ee06b2b0f3468fccd7b7f6b9edce9634 /src/diff.c | |
| parent | 2eea198564930225d51188682f548332a064037f (diff) | |
updated for version 7.3.008v7.3.008
Problem: 'cursorbind' is kept in places where 'scrollbind' is reset.
Solution: Reset 'cursorbind'.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/diff.c b/src/diff.c index 9b6d2791f0..5844ec9233 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1127,11 +1127,13 @@ diff_win_options(wp, addbuf) # endif wp->w_p_diff = TRUE; + /* Use 'scrollbind' and 'cursorbind' when available */ +#ifdef FEAT_SCROLLBIND + wp->w_p_scb = TRUE; +#endif #ifdef FEAT_CURSORBIND - /* Use cursorbind if it's available */ wp->w_p_crb = TRUE; #endif - wp->w_p_scb = TRUE; wp->w_p_wrap = FALSE; # ifdef FEAT_FOLDING curwin = wp; @@ -1177,10 +1179,7 @@ ex_diffoff(eap) { /* Set 'diff', 'scrollbind' off and 'wrap' on. */ wp->w_p_diff = FALSE; -#ifdef FEAT_CURSORBIND - wp->w_p_crb = FALSE; -#endif - wp->w_p_scb = FALSE; + RESET_BINDING(wp); wp->w_p_wrap = TRUE; #ifdef FEAT_FOLDING curwin = wp; |