From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 14 Dec 2013 12:06:17 +0000 (+0100)
Subject: updated for version 7.4.131
X-Git-Tag: v7.4.131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dedd1b0aba7e7125081fd3e71b629058d48dac1d;p=vim

updated for version 7.4.131
Problem:    Syncbind causes E315 errors in some situations. (Liang Li)
Solution:   Set and restore curbuf in ex_syncbind(). (Christian Brabandt)
---

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 5bbc4c305..bf5f81cca 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8054,6 +8054,8 @@ ex_syncbind(eap)
 {
 #ifdef FEAT_SCROLLBIND
     win_T	*wp;
+    win_T	*save_curwin = curwin;
+    buf_T	*save_curbuf = curbuf;
     long	topline;
     long	y;
     linenr_T	old_linenr = curwin->w_cursor.lnum;
@@ -8085,13 +8087,13 @@ ex_syncbind(eap)
 
 
     /*
-     * set all scrollbind windows to the same topline
+     * Set all scrollbind windows to the same topline.
      */
-    wp = curwin;
     for (curwin = firstwin; curwin; curwin = curwin->w_next)
     {
 	if (curwin->w_p_scb)
 	{
+	    curbuf = curwin->w_buffer;
 	    y = topline - curwin->w_topline;
 	    if (y > 0)
 		scrollup(y, TRUE);
@@ -8105,7 +8107,8 @@ ex_syncbind(eap)
 #endif
 	}
     }
-    curwin = wp;
+    curwin = save_curwin;
+    curbuf = save_curbuf;
     if (curwin->w_p_scb)
     {
 	did_syncbind = TRUE;
diff --git a/src/testdir/test37.ok b/src/testdir/test37.ok
index a9092a402..d0b74853b 100644
--- a/src/testdir/test37.ok
+++ b/src/testdir/test37.ok
@@ -27,7 +27,7 @@ UTSRQPONMLKJIHGREDCBA9876543210 02
 
 . line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
 :set scrollbind
-zt:
-. line 15 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 15
 :set scrollbind
-. line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
+. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
+j:
+. line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12
diff --git a/src/version.c b/src/version.c
index 4f2cf9d4d..6d12c6a78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    131,
 /**/
     130,
 /**/