From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 14 Dec 2013 11:48:58 +0000 (+0100)
Subject: updated for version 7.4.130
X-Git-Tag: v7.4.130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bd7b3f4ce0e70ff762689dc0fd9f41b54692694;p=vim

updated for version 7.4.130
Problem:    Relative line numbers mix up windows when using folds.
Solution:   Use hasFoldingWin() instead of hasFolding(). (Lech Lorens)
---

diff --git a/src/misc2.c b/src/misc2.c
index b8655e84a..650620318 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -487,7 +487,7 @@ get_cursor_rel_lnum(wp, lnum)
 	{
 	    while (lnum > cursor)
 	    {
-		(void)hasFolding(lnum, &lnum, NULL);
+		(void)hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
 		/* if lnum and cursor are in the same fold,
 		 * now lnum <= cursor */
 		if (lnum > cursor)
@@ -499,7 +499,7 @@ get_cursor_rel_lnum(wp, lnum)
 	{
 	    while (lnum < cursor)
 	    {
-		(void)hasFolding(lnum, NULL, &lnum);
+		(void)hasFoldingWin(wp, lnum, NULL, &lnum, TRUE, NULL);
 		/* if lnum and cursor are in the same fold,
 		 * now lnum >= cursor */
 		if (lnum < cursor)
diff --git a/src/version.c b/src/version.c
index fbfba649d..4f2cf9d4d 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 */
+/**/
+    130,
 /**/
     129,
 /**/