diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-12-14 12:48:58 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-12-14 12:48:58 +0100 |
commit | 0bd7b3f4ce0e70ff762689dc0fd9f41b54692694 (patch) | |
tree | 6f961d0fff73bc7d25b8598e7fcf834b62570c84 | |
parent | 959a143f2e17d81c108b60493815419c7772aa63 (diff) | |
download | vim-0bd7b3f4ce0e70ff762689dc0fd9f41b54692694.zip |
updated for version 7.4.130
Problem: Relative line numbers mix up windows when using folds.
Solution: Use hasFoldingWin() instead of hasFolding(). (Lech Lorens)
-rw-r--r-- | src/misc2.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
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 @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 130, +/**/ 129, /**/ 128, |