summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/move.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/move.c b/src/move.c
index 173063134a..447445b461 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 c16a374359..0e08703646 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 */
/**/
+ 106,
+/**/
105,
/**/
104,