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