To: vim-dev@vim.org
Subject: Patch 6.1.120
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.120 (depends on 6.1.097)
Problem:    When 'scrolloff' is non-zero and there are folds, CTRL-F at the
	    end of the file scrolls part of a closed fold.  (Lubomir Host)
Solution:   Adjust the first line to the start of a fold.
Files:	    src/move.c


*** ../vim61.119/src/move.c	Tue Jun 18 21:13:31 2002
--- src/move.c	Wed Jul  3 19:32:00 2002
***************
*** 2470,2476 ****
--- 2470,2481 ----
  	scroll_cursor_top(1, FALSE);
  	if (curwin->w_topline <= old_topline
  				  && old_topline < curbuf->b_ml.ml_line_count)
+ 	{
  	    curwin->w_topline = old_topline + 1;
+ #ifdef FEAT_FOLDING
+ 	    (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL);
+ #endif
+ 	}
      }
  
      redraw_later(VALID);
*** ../vim61.119/src/version.c	Mon Jul  1 20:00:59 2002
--- src/version.c	Thu Jul  4 20:42:47 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     120,
  /**/

-- 
MONK: ... and the Lord spake, saying, "First shalt thou take out the Holy Pin,
      then shalt thou count to three, no more, no less.  Three shalt be the
      number thou shalt count, and the number of the counting shalt be three.
      Four shalt thou not count, neither count thou two, excepting that thou
      then proceed to three.  Five is right out.  Once the number three, being
      the third number, be reached, then lobbest thou thy Holy Hand Grenade of
      Antioch towards thou foe, who being naughty in my sight, shall snuff it.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///