From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 22 Jan 2011 20:05:07 +0000 (+0100)
Subject: updated for version 7.3.106
X-Git-Tag: v7.3.106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3d419d719202a0d7320f200356590c6d85871e2;p=vim

updated for version 7.3.106
Problem:    When 'cursorbind' is set another window may scroll unexpectedly
            when 'scrollbind' is also set. (Xavier Wang)
Solution:   Don't call update_topline() if 'scrollbind' is set.
---

diff --git a/src/move.c b/src/move.c
index 173063134..447445b46 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2882,9 +2882,11 @@ do_check_cursorbind()
 	    if (has_mbyte)
 		mb_adjust_cursor();
 # endif
-
 	    redraw_later(VALID);
-	    update_topline();
+
+	    /* Only scroll when 'scrollbind' hasn't done this. */
+	    if (!curwin->w_p_scb)
+		update_topline();
 # ifdef FEAT_WINDOWS
 	    curwin->w_redr_status = TRUE;
 # endif
diff --git a/src/version.c b/src/version.c
index c16a37435..0e0870364 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 */
+/**/
+    106,
 /**/
     105,
 /**/