From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 2 Dec 2010 14:33:21 +0000 (+0100)
Subject: updated for version 7.3.071
X-Git-Tag: v7.3.071
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4161dccada960ec7bf97e5887287d42eb9139710;p=vim

updated for version 7.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.
---

diff --git a/src/option.c b/src/option.c
index 47537fa80..c8572d00a 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 5060675fd..82826b27c 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 5d96698a9..339b8eb4c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    71,
 /**/
     70,
 /**/