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 b8655e84aaaf1abd7102445baea0a25c1c2e1abc..650620318d023119f7d649f5eb59d399387b0912 100644 (file)
--- 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 fbfba649d7ff5c75b41294e4c1d5df45c5d539e6..4f2cf9d4d31e1239d0ca4c76c27d0c63a81917c5 100644 (file)
--- 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,
 /**/