From f3d419d719202a0d7320f200356590c6d85871e2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 22 Jan 2011 21:05:07 +0100
Subject: 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.

---
 src/move.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/move.c')

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
-- 
cgit v1.2.3