|
 |
96752f5 |
To: vim_dev@googlegroups.com
|
|
|
96752f5 |
Subject: Patch 7.4.130
|
|
|
96752f5 |
Fcc: outbox
|
|
|
96752f5 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
96752f5 |
Mime-Version: 1.0
|
|
|
96752f5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
96752f5 |
Content-Transfer-Encoding: 8bit
|
|
|
96752f5 |
------------
|
|
|
96752f5 |
|
|
|
96752f5 |
Patch 7.4.130
|
|
|
96752f5 |
Problem: Relative line numbers mix up windows when using folds.
|
|
|
96752f5 |
Solution: Use hasFoldingWin() instead of hasFolding(). (Lech Lorens)
|
|
|
96752f5 |
Files: src/misc2.c
|
|
|
96752f5 |
|
|
|
96752f5 |
|
|
|
96752f5 |
*** ../vim-7.4.129/src/misc2.c 2013-09-08 16:07:03.000000000 +0200
|
|
|
96752f5 |
--- src/misc2.c 2013-12-14 12:43:35.000000000 +0100
|
|
|
96752f5 |
***************
|
|
|
96752f5 |
*** 487,493 ****
|
|
|
96752f5 |
{
|
|
|
96752f5 |
while (lnum > cursor)
|
|
|
96752f5 |
{
|
|
|
96752f5 |
! (void)hasFolding(lnum, &lnum, NULL);
|
|
|
96752f5 |
/* if lnum and cursor are in the same fold,
|
|
|
96752f5 |
* now lnum <= cursor */
|
|
|
96752f5 |
if (lnum > cursor)
|
|
|
96752f5 |
--- 487,493 ----
|
|
|
96752f5 |
{
|
|
|
96752f5 |
while (lnum > cursor)
|
|
|
96752f5 |
{
|
|
|
96752f5 |
! (void)hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
|
|
|
96752f5 |
/* if lnum and cursor are in the same fold,
|
|
|
96752f5 |
* now lnum <= cursor */
|
|
|
96752f5 |
if (lnum > cursor)
|
|
|
96752f5 |
***************
|
|
|
96752f5 |
*** 499,505 ****
|
|
|
96752f5 |
{
|
|
|
96752f5 |
while (lnum < cursor)
|
|
|
96752f5 |
{
|
|
|
96752f5 |
! (void)hasFolding(lnum, NULL, &lnum);
|
|
|
96752f5 |
/* if lnum and cursor are in the same fold,
|
|
|
96752f5 |
* now lnum >= cursor */
|
|
|
96752f5 |
if (lnum < cursor)
|
|
|
96752f5 |
--- 499,505 ----
|
|
|
96752f5 |
{
|
|
|
96752f5 |
while (lnum < cursor)
|
|
|
96752f5 |
{
|
|
|
96752f5 |
! (void)hasFoldingWin(wp, lnum, NULL, &lnum, TRUE, NULL);
|
|
|
96752f5 |
/* if lnum and cursor are in the same fold,
|
|
|
96752f5 |
* now lnum >= cursor */
|
|
|
96752f5 |
if (lnum < cursor)
|
|
|
96752f5 |
*** ../vim-7.4.129/src/version.c 2013-12-14 12:17:34.000000000 +0100
|
|
|
96752f5 |
--- src/version.c 2013-12-14 12:44:27.000000000 +0100
|
|
|
96752f5 |
***************
|
|
|
96752f5 |
*** 740,741 ****
|
|
|
96752f5 |
--- 740,743 ----
|
|
|
96752f5 |
{ /* Add new patch number below this line */
|
|
|
96752f5 |
+ /**/
|
|
|
96752f5 |
+ 130,
|
|
|
96752f5 |
/**/
|
|
|
96752f5 |
|
|
|
96752f5 |
--
|
|
|
96752f5 |
Over the years, I've developed my sense of deja vu so acutely that now
|
|
|
96752f5 |
I can remember things that *have* happened before ...
|
|
|
96752f5 |
|
|
|
96752f5 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
96752f5 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
96752f5 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
96752f5 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|