jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.309
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.309
3ef2ca
Problem:    When increasing the size of the lower window, the upper window
3ef2ca
	    jumps back to the top. (Ron Aaron)
3ef2ca
Solution:   Change setting the topline. (Nobuhiro Takasaki)
3ef2ca
Files:	    src/window.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.308/src/window.c	2014-05-22 15:17:24.706440568 +0200
3ef2ca
--- src/window.c	2014-05-28 13:24:40.308068558 +0200
3ef2ca
***************
3ef2ca
*** 5710,5717 ****
3ef2ca
  		    --wp->w_wrow;
3ef2ca
  		}
3ef2ca
  	    }
3ef2ca
  	}
3ef2ca
! 	else
3ef2ca
  	{
3ef2ca
  	    while (sline > 0 && lnum > 1)
3ef2ca
  	    {
3ef2ca
--- 5710,5718 ----
3ef2ca
  		    --wp->w_wrow;
3ef2ca
  		}
3ef2ca
  	    }
3ef2ca
+             set_topline(wp, lnum);
3ef2ca
  	}
3ef2ca
! 	else if (sline > 0)
3ef2ca
  	{
3ef2ca
  	    while (sline > 0 && lnum > 1)
3ef2ca
  	    {
3ef2ca
***************
3ef2ca
*** 5748,5761 ****
3ef2ca
  		lnum++;
3ef2ca
  		wp->w_wrow -= line_size + sline;
3ef2ca
  	    }
3ef2ca
! 	    else if (sline >= 0)
3ef2ca
  	    {
3ef2ca
  		/* First line of file reached, use that as topline. */
3ef2ca
  		lnum = 1;
3ef2ca
  		wp->w_wrow -= sline;
3ef2ca
  	    }
3ef2ca
  	}
3ef2ca
- 	set_topline(wp, lnum);
3ef2ca
      }
3ef2ca
  
3ef2ca
      if (wp == curwin)
3ef2ca
--- 5749,5763 ----
3ef2ca
  		lnum++;
3ef2ca
  		wp->w_wrow -= line_size + sline;
3ef2ca
  	    }
3ef2ca
! 	    else if (sline > 0)
3ef2ca
  	    {
3ef2ca
  		/* First line of file reached, use that as topline. */
3ef2ca
  		lnum = 1;
3ef2ca
  		wp->w_wrow -= sline;
3ef2ca
  	    }
3ef2ca
+ 
3ef2ca
+             set_topline(wp, lnum);
3ef2ca
  	}
3ef2ca
      }
3ef2ca
  
3ef2ca
      if (wp == curwin)
3ef2ca
*** ../vim-7.4.308/src/version.c	2014-05-28 11:35:33.428011248 +0200
3ef2ca
--- src/version.c	2014-05-28 13:33:54.244073407 +0200
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     309,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Don't be humble ... you're not that great.
3ef2ca
                      -- Golda Meir
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    ///