summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-12-02 15:33:21 +0100
committerBram Moolenaar <Bram@vim.org>2010-12-02 15:33:21 +0100
commit4161dccada960ec7bf97e5887287d42eb9139710 (patch)
tree265f506711f1b90ee35011c96db973165c9ce73a
parentd4ddfafc2ac07d37a8c851ceb453f8872a0840ef (diff)
updated for version 7.3.071v7.3.071
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.c3
-rw-r--r--src/quickfix.c1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 47537fa808..c8572d00ac 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 5060675fd4..82826b27cb 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 5d96698a91..339b8eb4ca 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,