3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.173
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.173
3ef2ca
Problem:    When using scrollbind the cursor can end up below the last line.
3ef2ca
	    (mvxxc)
3ef2ca
Solution:   Reset w_botfill when scrolling up. (Christian Brabandt)
3ef2ca
Files:	    src/move.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.172/src/move.c	2012-11-28 18:15:42.000000000 +0100
3ef2ca
--- src/move.c	2014-02-11 15:39:24.758138292 +0100
3ef2ca
***************
3ef2ca
*** 2101,2106 ****
3ef2ca
--- 2101,2107 ----
3ef2ca
      int		used;
3ef2ca
      lineoff_T	loff;
3ef2ca
      lineoff_T	boff;
3ef2ca
+     linenr_T	old_topline = curwin->w_topline;
3ef2ca
  
3ef2ca
      loff.lnum = boff.lnum = curwin->w_cursor.lnum;
3ef2ca
  #ifdef FEAT_FOLDING
3ef2ca
***************
3ef2ca
*** 2156,2161 ****
3ef2ca
--- 2157,2164 ----
3ef2ca
  	curwin->w_topline = topline;
3ef2ca
  #ifdef FEAT_DIFF
3ef2ca
      curwin->w_topfill = topfill;
3ef2ca
+     if (old_topline > curwin->w_topline + curwin->w_height)
3ef2ca
+ 	curwin->w_botfill = FALSE;
3ef2ca
      check_topfill(curwin, FALSE);
3ef2ca
  #endif
3ef2ca
      curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP);
3ef2ca
*** ../vim-7.4.172/src/version.c	2014-02-11 15:23:27.942123631 +0100
3ef2ca
--- src/version.c	2014-02-11 15:38:34.562137523 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     173,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
   GALAHAD hurries to the door and pushes through it.  As he leaves the room
3ef2ca
   we CUT TO the reverse to show that he is now in a room full of bathing
3ef2ca
   and romping GIRLIES, all innocent, wide-eyed and beautiful.  They smile
3ef2ca
   enchantingly at him as he tries to keep walking without being diverted by
3ef2ca
   the lovely sights assaulting his eyeballs.
3ef2ca
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
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    ///