Karsten Hopp 315abb
To: vim_dev@googlegroups.com
Karsten Hopp 315abb
Subject: Patch 7.4.173
Karsten Hopp 315abb
Fcc: outbox
Karsten Hopp 315abb
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 315abb
Mime-Version: 1.0
Karsten Hopp 315abb
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 315abb
Content-Transfer-Encoding: 8bit
Karsten Hopp 315abb
------------
Karsten Hopp 315abb
Karsten Hopp 315abb
Patch 7.4.173
Karsten Hopp 315abb
Problem:    When using scrollbind the cursor can end up below the last line.
Karsten Hopp 315abb
	    (mvxxc)
Karsten Hopp 315abb
Solution:   Reset w_botfill when scrolling up. (Christian Brabandt)
Karsten Hopp 315abb
Files:	    src/move.c
Karsten Hopp 315abb
Karsten Hopp 315abb
Karsten Hopp 315abb
*** ../vim-7.4.172/src/move.c	2012-11-28 18:15:42.000000000 +0100
Karsten Hopp 315abb
--- src/move.c	2014-02-11 15:39:24.758138292 +0100
Karsten Hopp 315abb
***************
Karsten Hopp 315abb
*** 2101,2106 ****
Karsten Hopp 315abb
--- 2101,2107 ----
Karsten Hopp 315abb
      int		used;
Karsten Hopp 315abb
      lineoff_T	loff;
Karsten Hopp 315abb
      lineoff_T	boff;
Karsten Hopp 315abb
+     linenr_T	old_topline = curwin->w_topline;
Karsten Hopp 315abb
  
Karsten Hopp 315abb
      loff.lnum = boff.lnum = curwin->w_cursor.lnum;
Karsten Hopp 315abb
  #ifdef FEAT_FOLDING
Karsten Hopp 315abb
***************
Karsten Hopp 315abb
*** 2156,2161 ****
Karsten Hopp 315abb
--- 2157,2164 ----
Karsten Hopp 315abb
  	curwin->w_topline = topline;
Karsten Hopp 315abb
  #ifdef FEAT_DIFF
Karsten Hopp 315abb
      curwin->w_topfill = topfill;
Karsten Hopp 315abb
+     if (old_topline > curwin->w_topline + curwin->w_height)
Karsten Hopp 315abb
+ 	curwin->w_botfill = FALSE;
Karsten Hopp 315abb
      check_topfill(curwin, FALSE);
Karsten Hopp 315abb
  #endif
Karsten Hopp 315abb
      curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_BOTLINE_AP);
Karsten Hopp 315abb
*** ../vim-7.4.172/src/version.c	2014-02-11 15:23:27.942123631 +0100
Karsten Hopp 315abb
--- src/version.c	2014-02-11 15:38:34.562137523 +0100
Karsten Hopp 315abb
***************
Karsten Hopp 315abb
*** 740,741 ****
Karsten Hopp 315abb
--- 740,743 ----
Karsten Hopp 315abb
  {   /* Add new patch number below this line */
Karsten Hopp 315abb
+ /**/
Karsten Hopp 315abb
+     173,
Karsten Hopp 315abb
  /**/
Karsten Hopp 315abb
Karsten Hopp 315abb
-- 
Karsten Hopp 315abb
   GALAHAD hurries to the door and pushes through it.  As he leaves the room
Karsten Hopp 315abb
   we CUT TO the reverse to show that he is now in a room full of bathing
Karsten Hopp 315abb
   and romping GIRLIES, all innocent, wide-eyed and beautiful.  They smile
Karsten Hopp 315abb
   enchantingly at him as he tries to keep walking without being diverted by
Karsten Hopp 315abb
   the lovely sights assaulting his eyeballs.
Karsten Hopp 315abb
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp 315abb
Karsten Hopp 315abb
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 315abb
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 315abb
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 315abb
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///