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