jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.309
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.309
073263
Problem:    When increasing the size of the lower window, the upper window
073263
	    jumps back to the top. (Ron Aaron)
073263
Solution:   Change setting the topline. (Nobuhiro Takasaki)
073263
Files:	    src/window.c
073263
073263
073263
*** ../vim-7.4.308/src/window.c	2014-05-22 15:17:24.706440568 +0200
073263
--- src/window.c	2014-05-28 13:24:40.308068558 +0200
073263
***************
073263
*** 5710,5717 ****
073263
  		    --wp->w_wrow;
073263
  		}
073263
  	    }
073263
  	}
073263
! 	else
073263
  	{
073263
  	    while (sline > 0 && lnum > 1)
073263
  	    {
073263
--- 5710,5718 ----
073263
  		    --wp->w_wrow;
073263
  		}
073263
  	    }
073263
+             set_topline(wp, lnum);
073263
  	}
073263
! 	else if (sline > 0)
073263
  	{
073263
  	    while (sline > 0 && lnum > 1)
073263
  	    {
073263
***************
073263
*** 5748,5761 ****
073263
  		lnum++;
073263
  		wp->w_wrow -= line_size + sline;
073263
  	    }
073263
! 	    else if (sline >= 0)
073263
  	    {
073263
  		/* First line of file reached, use that as topline. */
073263
  		lnum = 1;
073263
  		wp->w_wrow -= sline;
073263
  	    }
073263
  	}
073263
- 	set_topline(wp, lnum);
073263
      }
073263
  
073263
      if (wp == curwin)
073263
--- 5749,5763 ----
073263
  		lnum++;
073263
  		wp->w_wrow -= line_size + sline;
073263
  	    }
073263
! 	    else if (sline > 0)
073263
  	    {
073263
  		/* First line of file reached, use that as topline. */
073263
  		lnum = 1;
073263
  		wp->w_wrow -= sline;
073263
  	    }
073263
+ 
073263
+             set_topline(wp, lnum);
073263
  	}
073263
      }
073263
  
073263
      if (wp == curwin)
073263
*** ../vim-7.4.308/src/version.c	2014-05-28 11:35:33.428011248 +0200
073263
--- src/version.c	2014-05-28 13:33:54.244073407 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     309,
073263
  /**/
073263
073263
-- 
073263
Don't be humble ... you're not that great.
073263
                      -- Golda Meir
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///