diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-12-02 15:33:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-12-02 15:33:21 +0100 |
| commit | f8e313dde7956f273af4a0f5518ef24fe6f87e4a (patch) | |
| tree | 857a67042beabca762a87b417c2ffa49cc2b8621 | |
| parent | 44d14f9d357f949359c81d4fd38ff2ff84385da4 (diff) | |
| download | vim-f8e313dde7956f273af4a0f5518ef24fe6f87e4a.tar.gz | |
Problem: Editing a file in a window that's in diff mode resets 'diff'
but not cursor binding.
Solution: Reset cursor binding in two more places.
| -rw-r--r-- | src/option.c | 3 | ||||
| -rw-r--r-- | src/quickfix.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index 47537fa8..c8572d00 100644 --- a/src/option.c +++ b/src/option.c @@ -9756,6 +9756,9 @@ copy_winopt(from, to) #ifdef FEAT_SCROLLBIND to->wo_scb = from->wo_scb; #endif +#ifdef FEAT_CURSORBIND + to->wo_crb = from->wo_crb; +#endif #ifdef FEAT_SPELL to->wo_spell = from->wo_spell; #endif diff --git a/src/quickfix.c b/src/quickfix.c index 5060675f..82826b27 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2359,6 +2359,7 @@ ex_copen(eap) set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", OPT_LOCAL); set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); + RESET_BINDING(curwin); #ifdef FEAT_DIFF curwin->w_p_diff = FALSE; #endif diff --git a/src/version.c b/src/version.c index 5d96698a..339b8eb4 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 71, +/**/ 70, /**/ 69, |