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 173063134a04d7b5ee3f1c77a9a1e61e48ffd519..447445b4612b28371fc4ea7ca57c7ea2662cd457 100644 (file)
--- 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 c16a37435933f833dda48430ceb80748a92649f9..0e08703646bae2603b3e28a2662d190e22da33cd 100644 (file)
--- 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,
 /**/