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