# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1295726707 -3600
# Node ID f016c3708ae32436ab545762a1bfb8ebd31af975
# Parent  ef7fdb3c6927725abb07731a46ab78404ad4c7e8
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
--- 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);
 
-	    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
--- 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 */
 /**/
+    106,
+/**/
     105,
 /**/
     104,