updated patches... moved patches out of portage to ibiblio

66 files changed, 235 insertions, 6740 deletions

diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index fb5bf223f118..e2c756d220f0 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.14 2002/07/16 02:05:38 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.15 2002/07/30 07:22:48 rphillips Exp $
+
+vim-6.1-r9.ebuild (29 Jul 2002)
+
+  29 Jul 2002; Ryan Phillips <rphillips@gentoo.org> vim-6.1-r9.ebuild 
+  and patches :
+
+  Updated patches. The patches no longer take tons of space in portage.
 
 vim-6.1-r8.ebuild (06 Jul 2002)
 		
diff --git a/app-editors/vim/files/6.1.001 b/app-editors/vim/files/6.1.001
deleted file mode 100644
index 696d59f2780c..000000000000
--- a/app-editors/vim/files/6.1.001
+++ /dev/null
@@ -1,223 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.001
-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.001
-Problem:    When formatting UTF-8 text it might be wrapped at a space that is
-	    followed by a composing character. (Raphael Finkel)
-	    Also correct a display error for removing a composing char on top
-	    of a space.
-Solution:   Check for a composing character on a space.
-Files:	    src/edit.c, src/misc1.c, src/screen.c
-
-
-*** ../vim-6.1/src/edit.c	Sun Mar 24 19:23:31 2002
---- src/edit.c	Wed Mar 27 19:25:13 2002
-***************
-*** 3669,3674 ****
---- 3669,3680 ----
-  # define ISSPECIAL(c)	((c) < ' ' || (c) >= DEL || (c) == '0' || (c) == '^')
-  #endif
-  
-+ #ifdef FEAT_MBYTE
-+ # define WHITECHAR(cc) (vim_iswhite(cc) && (!enc_utf8 || !utf_iscomposing(utf_ptr2char(ml_get_cursor() + 1))))
-+ #else
-+ # define WHITECHAR(cc) vim_iswhite(cc)
-+ #endif
-+ 
-      void
-  insertchar(c, flags, second_indent)
-      int		c;			/* character to insert or NUL */
-***************
-*** 3814,3831 ****
-  			|| curwin->w_cursor.col >= Insstart.col)
-  	    {
-  		cc = gchar_cursor();
-! 		if (vim_iswhite(cc))
-  		{
-  		    /* remember position of blank just before text */
-  		    end_foundcol = curwin->w_cursor.col;
-  
-  		    /* find start of sequence of blanks */
-! 		    while (curwin->w_cursor.col > 0 && vim_iswhite(cc))
-  		    {
-  			dec_cursor();
-  			cc = gchar_cursor();
-  		    }
-! 		    if (curwin->w_cursor.col == 0 && vim_iswhite(cc))
-  			break;		/* only spaces in front of text */
-  #ifdef FEAT_COMMENTS
-  		    /* Don't break until after the comment leader */
---- 3820,3837 ----
-  			|| curwin->w_cursor.col >= Insstart.col)
-  	    {
-  		cc = gchar_cursor();
-! 		if (WHITECHAR(cc))
-  		{
-  		    /* remember position of blank just before text */
-  		    end_foundcol = curwin->w_cursor.col;
-  
-  		    /* find start of sequence of blanks */
-! 		    while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
-  		    {
-  			dec_cursor();
-  			cc = gchar_cursor();
-  		    }
-! 		    if (curwin->w_cursor.col == 0 && WHITECHAR(cc))
-  			break;		/* only spaces in front of text */
-  #ifdef FEAT_COMMENTS
-  		    /* Don't break until after the comment leader */
-***************
-*** 3842,3848 ****
-  			dec_cursor();
-  			cc = gchar_cursor();
-  
-! 			if (vim_iswhite(cc))
-  			    continue;	/* one-letter, continue */
-  			curwin->w_cursor.col = col;
-  		    }
---- 3848,3854 ----
-  			dec_cursor();
-  			cc = gchar_cursor();
-  
-! 			if (WHITECHAR(cc))
-  			    continue;	/* one-letter, continue */
-  			curwin->w_cursor.col = col;
-  		    }
-***************
-*** 3899,3905 ****
-  	     * characters that will remain on top line
-  	     */
-  	    curwin->w_cursor.col = foundcol;
-! 	    while (cc = gchar_cursor(), vim_iswhite(cc))
-  		inc_cursor();
-  	    startcol -= curwin->w_cursor.col;
-  	    if (startcol < 0)
---- 3905,3911 ----
-  	     * characters that will remain on top line
-  	     */
-  	    curwin->w_cursor.col = foundcol;
-! 	    while (cc = gchar_cursor(), WHITECHAR(cc))
-  		inc_cursor();
-  	    startcol -= curwin->w_cursor.col;
-  	    if (startcol < 0)
-*** ../vim-6.1/src/misc1.c	Sun Mar 24 19:23:31 2002
---- src/misc1.c	Wed Mar 27 19:31:45 2002
-***************
-*** 931,937 ****
-  	    replace_push(NUL);	    /* end of extra blanks */
-  	if (curbuf->b_p_ai || (flags & OPENLINE_DELSPACES))
-  	{
-! 	    while (*p_extra == ' ' || *p_extra == '\t')
-  	    {
-  		if (REPLACE_NORMAL(State))
-  		    replace_push(*p_extra);
---- 931,942 ----
-  	    replace_push(NUL);	    /* end of extra blanks */
-  	if (curbuf->b_p_ai || (flags & OPENLINE_DELSPACES))
-  	{
-! 	    while ((*p_extra == ' ' || *p_extra == '\t')
-! #ifdef FEAT_MBYTE
-! 		    && (!enc_utf8
-! 			       || !utf_iscomposing(utf_ptr2char(p_extra + 1)))
-! #endif
-! 		    )
-  	    {
-  		if (REPLACE_NORMAL(State))
-  		    replace_push(*p_extra);
-*** ../vim-6.1/src/screen.c	Sun Mar 24 19:23:32 2002
---- src/screen.c	Thu Mar 28 20:19:23 2002
-***************
-*** 3991,3997 ****
-  	if (clear_width > 0)
-  	{
-  	    while (col <= endcol && ScreenLines[off_to] == ' '
-! 						  && ScreenAttrs[off_to] == 0)
-  	    {
-  		++off_to;
-  		++col;
---- 3991,4001 ----
-  	if (clear_width > 0)
-  	{
-  	    while (col <= endcol && ScreenLines[off_to] == ' '
-! 		    && ScreenAttrs[off_to] == 0
-! #ifdef FEAT_MBYTE
-! 				  && (!enc_utf8 || ScreenLinesUC[off_to] == 0)
-! #endif
-! 						  )
-  	    {
-  		++off_to;
-  		++col;
-***************
-*** 4220,4226 ****
-  
-  	/* blank out the rest of the line */
-  	while (col < clear_width && ScreenLines[off_to] == ' '
-! 						  && ScreenAttrs[off_to] == 0)
-  	{
-  	    ++off_to;
-  	    ++col;
---- 4224,4234 ----
-  
-  	/* blank out the rest of the line */
-  	while (col < clear_width && ScreenLines[off_to] == ' '
-! 						  && ScreenAttrs[off_to] == 0
-! #ifdef FEAT_MBYTE
-! 				  && (!enc_utf8 || ScreenLinesUC[off_to] == 0)
-! #endif
-! 						  )
-  	{
-  	    ++off_to;
-  	    ++col;
-***************
-*** 5841,5849 ****
-  	    end_off = LineOffset[row] + end_col;
-  
-  	    /* skip blanks (used often, keep it fast!) */
-! 	    while (off < end_off && ScreenLines[off] == ' '
-  						     && ScreenAttrs[off] == 0)
-! 		++off;
-  	    if (off < end_off)		/* something to be cleared */
-  	    {
-  		col = off - LineOffset[row];
---- 5849,5864 ----
-  	    end_off = LineOffset[row] + end_col;
-  
-  	    /* skip blanks (used often, keep it fast!) */
-! #ifdef FEAT_MBYTE
-! 	    if (enc_utf8)
-! 		while (off < end_off && ScreenLines[off] == ' '
-! 			  && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0)
-! 		    ++off;
-! 	    else
-! #endif
-! 		while (off < end_off && ScreenLines[off] == ' '
-  						     && ScreenAttrs[off] == 0)
-! 		    ++off;
-  	    if (off < end_off)		/* something to be cleared */
-  	    {
-  		col = off - LineOffset[row];
-*** ../vim-6.1/src/version.c	Sun Mar 24 19:23:35 2002
---- src/version.c	Sat Mar 30 16:51:28 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     1,
-  /**/
-
--- 
-Time is an illusion.  Lunchtime doubly so.
-		-- Ford Prefect, in Douglas Adams'
-		   "The Hitchhiker's Guide to the Galaxy"
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.003 b/app-editors/vim/files/6.1.003
deleted file mode 100644
index 1cf5141398fd..000000000000
--- a/app-editors/vim/files/6.1.003
+++ /dev/null
@@ -1,55 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.003
-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.003
-Problem:    When 'laststatus' is zero and there is a vertical split, the
-	    vertical separator is drawn in the command line. (Srikant
-	    Sankaran)
-Solution:   Don't draw the vertical separator where there is no statusline.
-Files:	    src/screen.c
-
-
-*** ../vim61.002/src/screen.c	Sat Mar 30 16:59:33 2002
---- src/screen.c	Thu Mar 28 20:19:23 2002
-***************
-*** 4834,4840 ****
-      /*
-       * May need to draw the character below the vertical separator.
-       */
-!     if (wp->w_vsep_width != 0)
-      {
-  	if (stl_connected(wp))
-  	    fillchar = fillchar_status(&attr, wp == curwin);
---- 4834,4840 ----
-      /*
-       * May need to draw the character below the vertical separator.
-       */
-!     if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing())
-      {
-  	if (stl_connected(wp))
-  	    fillchar = fillchar_status(&attr, wp == curwin);
-*** ../vim61.002/src/version.c	Sat Mar 30 17:05:41 2002
---- src/version.c	Sat Mar 30 17:08:19 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     3,
-  /**/
-
--- 
-'Well, here's something to occupy you and keep your mind off things.'
-'It won't work, I have an exceptionally large mind.'
-		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.004 b/app-editors/vim/files/6.1.004
deleted file mode 100644
index 7459b4b34694..000000000000
--- a/app-editors/vim/files/6.1.004
+++ /dev/null
@@ -1,131 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.004
-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.004
-Problem:    Unicode 3.2 changes width and composing of a few characters. 
-            (Markus Kuhn)
-Solution:   Adjust the Unicode functions for the character width and composing
-            characters.
-Files:      src/mbyte.c
-
-
-*** ../vim61.003/src/mbyte.c	Sat Mar  9 20:38:05 2002
---- src/mbyte.c	Fri Mar 29 16:01:29 2002
-***************
-*** 927,939 ****
-  	    return 6;		/* unprintable, displays <xxxx> */
-  	if (c >= 0x1100
-  	    && (c <= 0x115f			/* Hangul Jamo */
-! 		|| (c >= 0x2e80 && c <= 0xa4cf && (c & ~0x0011) != 0x300a
-  		    && c != 0x303f)		/* CJK ... Yi */
-  		|| (c >= 0xac00 && c <= 0xd7a3)	/* Hangul Syllables */
-  		|| (c >= 0xf900 && c <= 0xfaff)	/* CJK Compatibility
-  						   Ideographs */
-  		|| (c >= 0xfe30 && c <= 0xfe6f)	/* CJK Compatibility Forms */
-! 		|| (c >= 0xff00 && c <= 0xff5f)	/* Fullwidth Forms */
-  		|| (c >= 0xffe0 && c <= 0xffe6)
-  		|| (c >= 0x20000 && c <= 0x2ffff)))
-  	    return 2;
---- 927,941 ----
-  	    return 6;		/* unprintable, displays <xxxx> */
-  	if (c >= 0x1100
-  	    && (c <= 0x115f			/* Hangul Jamo */
-! 		|| c == 0x2329
-! 		|| c == 0x232a
-! 		|| (c >= 0x2e80 && c <= 0xa4cf
-  		    && c != 0x303f)		/* CJK ... Yi */
-  		|| (c >= 0xac00 && c <= 0xd7a3)	/* Hangul Syllables */
-  		|| (c >= 0xf900 && c <= 0xfaff)	/* CJK Compatibility
-  						   Ideographs */
-  		|| (c >= 0xfe30 && c <= 0xfe6f)	/* CJK Compatibility Forms */
-! 		|| (c >= 0xff00 && c <= 0xff60)	/* Fullwidth Forms */
-  		|| (c >= 0xffe0 && c <= 0xffe6)
-  		|| (c >= 0x20000 && c <= 0x2ffff)))
-  	    return 2;
-***************
-*** 1447,1475 ****
-      /* sorted list of non-overlapping intervals */
-      static struct interval combining[] =
-      {
-! 	{0x0300, 0x034E}, {0x0360, 0x0362}, {0x0483, 0x0486}, {0x0488, 0x0489},
-  	{0x0591, 0x05A1}, {0x05A3, 0x05B9}, {0x05BB, 0x05BD}, {0x05BF, 0x05BF},
-  	{0x05C1, 0x05C2}, {0x05C4, 0x05C4}, {0x064B, 0x0655}, {0x0670, 0x0670},
-! 	{0x06D6, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED}, {0x0711, 0x0711},
-! 	{0x0730, 0x074A}, {0x07A6, 0x07B0}, {0x0901, 0x0902}, {0x093C, 0x093C},
-! 	{0x0941, 0x0948}, {0x094D, 0x094D}, {0x0951, 0x0954}, {0x0962, 0x0963},
-! 	{0x0981, 0x0981}, {0x09BC, 0x09BC}, {0x09C1, 0x09C4}, {0x09CD, 0x09CD},
-! 	{0x09E2, 0x09E3}, {0x0A02, 0x0A02}, {0x0A3C, 0x0A3C}, {0x0A41, 0x0A42},
-! 	{0x0A47, 0x0A48}, {0x0A4B, 0x0A4D}, {0x0A70, 0x0A71}, {0x0A81, 0x0A82},
-! 	{0x0ABC, 0x0ABC}, {0x0AC1, 0x0AC5}, {0x0AC7, 0x0AC8}, {0x0ACD, 0x0ACD},
-! 	{0x0B01, 0x0B01}, {0x0B3C, 0x0B3C}, {0x0B3F, 0x0B3F}, {0x0B41, 0x0B43},
-! 	{0x0B4D, 0x0B4D}, {0x0B56, 0x0B56}, {0x0B82, 0x0B82}, {0x0BC0, 0x0BC0},
-! 	{0x0BCD, 0x0BCD}, {0x0C3E, 0x0C40}, {0x0C46, 0x0C48}, {0x0C4A, 0x0C4D},
-! 	{0x0C55, 0x0C56}, {0x0CBF, 0x0CBF}, {0x0CC6, 0x0CC6}, {0x0CCC, 0x0CCD},
-! 	{0x0D41, 0x0D43}, {0x0D4D, 0x0D4D}, {0x0DCA, 0x0DCA}, {0x0DD2, 0x0DD4},
-! 	{0x0DD6, 0x0DD6}, {0x0E31, 0x0E31}, {0x0E34, 0x0E3A}, {0x0E47, 0x0E4E},
-! 	{0x0EB1, 0x0EB1}, {0x0EB4, 0x0EB9}, {0x0EBB, 0x0EBC}, {0x0EC8, 0x0ECD},
-! 	{0x0F18, 0x0F19}, {0x0F35, 0x0F35}, {0x0F37, 0x0F37}, {0x0F39, 0x0F39},
-! 	{0x0F71, 0x0F7E}, {0x0F80, 0x0F84}, {0x0F86, 0x0F87}, {0x0F90, 0x0F97},
-! 	{0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102D, 0x1030}, {0x1032, 0x1032},
-! 	{0x1036, 0x1037}, {0x1039, 0x1039}, {0x1058, 0x1059}, {0x17B7, 0x17BD},
-! 	{0x17C6, 0x17C6}, {0x17C9, 0x17D3}, {0x18A9, 0x18A9}, {0x20D0, 0x20E3},
-! 	{0x302A, 0x302F}, {0x3099, 0x309A}, {0xFB1E, 0xFB1E}, {0xFE20, 0xFE23}
-      };
-  
-      return intable(combining, sizeof(combining) / sizeof(struct interval), c);
---- 1449,1479 ----
-      /* sorted list of non-overlapping intervals */
-      static struct interval combining[] =
-      {
-! 	{0x0300, 0x034F}, {0x0360, 0x036F}, {0x0483, 0x0486}, {0x0488, 0x0489},
-  	{0x0591, 0x05A1}, {0x05A3, 0x05B9}, {0x05BB, 0x05BD}, {0x05BF, 0x05BF},
-  	{0x05C1, 0x05C2}, {0x05C4, 0x05C4}, {0x064B, 0x0655}, {0x0670, 0x0670},
-! 	{0x06D6, 0x06DC}, {0x06DE, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED},
-! 	{0x0711, 0x0711}, {0x0730, 0x074A}, {0x07A6, 0x07B0}, {0x0901, 0x0902},
-! 	{0x093C, 0x093C}, {0x0941, 0x0948}, {0x094D, 0x094D}, {0x0951, 0x0954},
-! 	{0x0962, 0x0963}, {0x0981, 0x0981}, {0x09BC, 0x09BC}, {0x09C1, 0x09C4},
-! 	{0x09CD, 0x09CD}, {0x09E2, 0x09E3}, {0x0A02, 0x0A02}, {0x0A3C, 0x0A3C},
-! 	{0x0A41, 0x0A42}, {0x0A47, 0x0A48}, {0x0A4B, 0x0A4D}, {0x0A70, 0x0A71},
-! 	{0x0A81, 0x0A82}, {0x0ABC, 0x0ABC}, {0x0AC1, 0x0AC5}, {0x0AC7, 0x0AC8},
-! 	{0x0ACD, 0x0ACD}, {0x0B01, 0x0B01}, {0x0B3C, 0x0B3C}, {0x0B3F, 0x0B3F},
-! 	{0x0B41, 0x0B43}, {0x0B4D, 0x0B4D}, {0x0B56, 0x0B56}, {0x0B82, 0x0B82},
-! 	{0x0BC0, 0x0BC0}, {0x0BCD, 0x0BCD}, {0x0C3E, 0x0C40}, {0x0C46, 0x0C48},
-! 	{0x0C4A, 0x0C4D}, {0x0C55, 0x0C56}, {0x0CBF, 0x0CBF}, {0x0CC6, 0x0CC6},
-! 	{0x0CCC, 0x0CCD}, {0x0D41, 0x0D43}, {0x0D4D, 0x0D4D}, {0x0DCA, 0x0DCA},
-! 	{0x0DD2, 0x0DD4}, {0x0DD6, 0x0DD6}, {0x0E31, 0x0E31}, {0x0E34, 0x0E3A},
-! 	{0x0E47, 0x0E4E}, {0x0EB1, 0x0EB1}, {0x0EB4, 0x0EB9}, {0x0EBB, 0x0EBC},
-! 	{0x0EC8, 0x0ECD}, {0x0F18, 0x0F19}, {0x0F35, 0x0F35}, {0x0F37, 0x0F37},
-! 	{0x0F39, 0x0F39}, {0x0F71, 0x0F7E}, {0x0F80, 0x0F84}, {0x0F86, 0x0F87},
-! 	{0x0F90, 0x0F97}, {0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102D, 0x1030},
-! 	{0x1032, 0x1032}, {0x1036, 0x1037}, {0x1039, 0x1039}, {0x1058, 0x1059},
-! 	{0x1712, 0x1714}, {0x1732, 0x1734}, {0x1752, 0x1753}, {0x1772, 0x1773},
-! 	{0x17B7, 0x17BD}, {0x17C6, 0x17C6}, {0x17C9, 0x17D3}, {0x180B, 0x180D},
-! 	{0x18A9, 0x18A9}, {0x20D0, 0x20EA}, {0x302A, 0x302F}, {0x3099, 0x309A},
-! 	{0xFB1E, 0xFB1E}, {0xFE00, 0xFE0F}, {0xFE20, 0xFE23}
-      };
-  
-      return intable(combining, sizeof(combining) / sizeof(struct interval), c);
-*** ../vim61.003/src/version.c	Sat Mar 30 17:11:06 2002
---- src/version.c	Sat Mar 30 17:13:41 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     4,
-  /**/
-
--- 
-What a wonderfully exciting cough!  Do you mind if I join you?
-		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.005 b/app-editors/vim/files/6.1.005
deleted file mode 100644
index 500b74c99ce6..000000000000
--- a/app-editors/vim/files/6.1.005
+++ /dev/null
@@ -1,65 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.005
-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.005
-Problem:    When using more than 50 items in 'statusline' Vim might crash.
-	    (Steve Hall)
-Solution:   Increment itemcnt in check_stl_option(). (Flemming Madsen)
-Files:	    src/option.c
-
-
-*** ../vim61.004/src/option.c	Sat Mar  9 16:17:30 2002
---- src/option.c	Mon Mar 25 20:49:31 2002
-***************
-*** 5431,5436 ****
---- 5431,5438 ----
-  	if (!*s)
-  	    break;
-  	s++;
-+ 	if (*s != '%' && *s != ')')
-+ 	    ++itemcnt;
-  	if (*s == '%' || *s == STL_TRUNCMARK || *s == STL_MIDDLEMARK)
-  	{
-  	    s++;
-***************
-*** 5439,5445 ****
-  	if (*s == ')')
-  	{
-  	    s++;
-! 	    groupdepth--;
-  	    continue;
-  	}
-  	if (*s == '-')
---- 5441,5448 ----
-  	if (*s == ')')
-  	{
-  	    s++;
-! 	    if (--groupdepth < 0)
-! 		break;
-  	    continue;
-  	}
-  	if (*s == '-')
-*** ../vim61.004/src/version.c	Sat Mar 30 17:15:14 2002
---- src/version.c	Sat Mar 30 19:55:30 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     5,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-31. You code your homework in HTML and give your instructor the URL.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.006 b/app-editors/vim/files/6.1.006
deleted file mode 100644
index b0410ddc70e6..000000000000
--- a/app-editors/vim/files/6.1.006
+++ /dev/null
@@ -1,160 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.006
-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.006
-Problem:    When using "P" in Visual mode to put linewise selected text, the
-	    wrong text is deleted. (Jakub Turski)
-Solution:   Put the text before the Visual area and correct the text to be
-	    deleted for the inserted lines.
-	    Also fix that "p" of linewise text in Visual block mode doesn't
-	    work correctly.
-Files:	    src/normal.c, src/ops.c
-
-
-*** ../vim61.005/src/normal.c	Sun Mar 24 12:36:35 2002
---- src/normal.c	Wed Apr  3 22:08:14 2002
-***************
-*** 7890,7911 ****
-  	{
-  	    /* Putting in Visual mode: The put text replaces the selected
-  	     * text.  First put the register at the end of the Visual
-! 	     * selection, then delete the selected text. */
-  	    curpos = curwin->w_cursor;
-  	    if (VIsual_mode == Ctrl_V)
-  	    {
-  		getvcols(curwin, &curwin->w_cursor, &VIsual, &left, &right);
-! 		if (lt(VIsual, curwin->w_cursor))
-! 		    curwin->w_cursor = VIsual;
-  		coladvance(right);
-  	    }
-! 	    else if (lt(curwin->w_cursor, VIsual))
-! 		curwin->w_cursor = VIsual;
-  	    if (VIsual_mode == 'v' && *p_sel == 'e')
-  		dir = BACKWARD;
-  	    else
-  	    {
-! 		if (dir == BACKWARD)
-  		    flags |= PUT_LINE_BACKWARD;
-  		dir = FORWARD;
-  	    }
---- 7890,7923 ----
-  	{
-  	    /* Putting in Visual mode: The put text replaces the selected
-  	     * text.  First put the register at the end of the Visual
-! 	     * selection, then delete the selected text.  In some cases the
-! 	     * register is put before the Visual selection. */
-! 	    if (lt(VIsual, curwin->w_cursor))
-! 	    {
-! 		curbuf->b_visual_start = VIsual;
-! 		curbuf->b_visual_end = curwin->w_cursor;
-! 	    }
-! 	    else
-! 	    {
-! 		curbuf->b_visual_start = curwin->w_cursor;
-! 		curbuf->b_visual_end = VIsual;
-! 	    }
-  	    curpos = curwin->w_cursor;
-  	    if (VIsual_mode == Ctrl_V)
-  	    {
-  		getvcols(curwin, &curwin->w_cursor, &VIsual, &left, &right);
-! 		curwin->w_cursor = curbuf->b_visual_start;
-  		coladvance(right);
-  	    }
-! 	    else
-! 		curwin->w_cursor = curbuf->b_visual_end;
-  	    if (VIsual_mode == 'v' && *p_sel == 'e')
-  		dir = BACKWARD;
-  	    else
-  	    {
-! 		/* Put linewise text above a characterwise or blockwise
-! 		 * selected Visual area; handled in do_put(). */
-! 		if (dir == BACKWARD && VIsual_mode != 'V')
-  		    flags |= PUT_LINE_BACKWARD;
-  		dir = FORWARD;
-  	    }
-***************
-*** 7923,7928 ****
---- 7935,7952 ----
-  #ifdef FEAT_VISUAL
-  	if (VIsual_active)
-  	{
-+ 	    /* If linewise text was put above the Visual area, need to correct
-+ 	     * the line numbers to shift the Visual area down. */
-+ 	    if ((flags & PUT_LINE_BACKWARD)
-+ 		    && curbuf->b_visual_start.lnum > curbuf->b_op_end.lnum)
-+ 	    {
-+ 		linenr_T l;
-+ 
-+ 		l = curbuf->b_op_end.lnum - curbuf->b_op_start.lnum + 1;
-+ 		curpos.lnum += l;
-+ 		VIsual.lnum += l;
-+ 	    }
-+ 
-  	    /* Now delete the selected text. */
-  	    cap->cmdchar = 'd';
-  	    cap->nchar = NUL;
-*** ../vim61.005/src/ops.c	Sat Mar  2 13:02:33 2002
---- src/ops.c	Wed Apr  3 22:27:05 2002
-***************
-*** 2985,2992 ****
-  	y_array = y_current->y_array;
-      }
-  
-!     if ((flags & PUT_LINE_BACKWARD) && y_type == MLINE)
-! 	dir = BACKWARD;
-      if (flags & PUT_LINE)	    /* :put command */
-  	y_type = MLINE;
-  
---- 2985,3012 ----
-  	y_array = y_current->y_array;
-      }
-  
-! #ifdef FEAT_VISUAL
-!     if (y_type == MLINE)
-!     {
-! 	if (flags & PUT_LINE_BACKWARD)
-! 	{
-! 	    /* "P" in Visual mode: Put before the Visual area instead of after
-! 	     * it.  It's OK to change the cursor position here (special
-! 	     * case!). */
-! 	    dir = BACKWARD;
-! 	    curwin->w_cursor = curbuf->b_visual_start;
-! 	}
-! 	else if (VIsual_active && VIsual_mode == Ctrl_V)
-! 	{
-! 	    /* "p" in Visual block mode with linewise text: put below the
-! 	     * block. */
-! 	    curwin->w_cursor = curbuf->b_visual_end;
-! 	}
-! 	curbuf->b_op_start = curwin->w_cursor;	/* default for '[ mark */
-! 	curbuf->b_op_end = curwin->w_cursor;	/* default for '] mark */
-!     }
-! #endif
-! 
-      if (flags & PUT_LINE)	    /* :put command */
-  	y_type = MLINE;
-  
-*** ../vim61.005/src/version.c	Sat Mar 30 20:03:55 2002
---- src/version.c	Wed Apr  3 22:29:25 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     6,
-  /**/
-
--- 
-"I simultaneously try to keep my head in the clouds and my feet on the
-ground.  Sometimes it's a stretch, though."              -- Larry Wall
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.007 b/app-editors/vim/files/6.1.007
deleted file mode 100644
index 3a3c5feb85ef..000000000000
--- a/app-editors/vim/files/6.1.007
+++ /dev/null
@@ -1,63 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.007
-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.007
-Problem:    Using ":filetype plugin off" when filetype plugins were never
-	    enabled causes an error message. (Yiu Wing)
-Solution:   Use ":silent!" to avoid the error message.
-Files:	    runtime/ftplugof.vim
-
-
-*** ../vim61.006/runtime/ftplugof.vim	Sun Oct 15 12:40:21 2000
---- runtime/ftplugof.vim	Thu Apr  4 22:00:16 2002
-***************
-*** 1,11 ****
-  " Vim support file to switch off loading plugins for file types
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2000 Oct 15
-  
-  if exists("did_load_ftplugin")
-    unlet did_load_ftplugin
-  endif
-  
-  " Remove all autocommands in the filetypeplugin group
-! au! filetypeplugin *
---- 1,11 ----
-  " Vim support file to switch off loading plugins for file types
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last Change:	2002 Apr 04
-  
-  if exists("did_load_ftplugin")
-    unlet did_load_ftplugin
-  endif
-  
-  " Remove all autocommands in the filetypeplugin group
-! silent! au! filetypeplugin *
-*** ../vim61.006/src/version.c	Wed Apr  3 22:33:54 2002
---- src/version.c	Thu Apr  4 22:06:21 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     7,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-72. Somebody at IRC just mentioned a way to obtain full motion video without
-    a PC using a wireless protocol called NTSC, you wonder how you never
-    heard about it
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.008 b/app-editors/vim/files/6.1.008
deleted file mode 100644
index 86b26fcea2dd..000000000000
--- a/app-editors/vim/files/6.1.008
+++ /dev/null
@@ -1,60 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.008
-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.008
-Problem:    The "%" command doesn't ignore \" inside a string, it's seen as
-	    the end of the string. (Ken Clark)
-Solution:   Skip a double quote preceded by an odd number of backslashes.
-Files:	    src/search.c
-
-
-*** ../vim61.007/src/search.c	Thu Mar 14 22:55:14 2002
---- src/search.c	Fri Apr  5 20:05:24 2002
-***************
-*** 1890,1900 ****
-  	    {
-  		int col;
-  
-- 		c = 0;
-  		for (col = pos.col - 1; col >= 0; --col)
-  		    if (linep[col] != '\\')
-  			break;
-! 		if ((c & 1) == 0)
-  		{
-  		    inquote = !inquote;
-  		    start_in_quotes = FALSE;
---- 1895,1904 ----
-  	    {
-  		int col;
-  
-  		for (col = pos.col - 1; col >= 0; --col)
-  		    if (linep[col] != '\\')
-  			break;
-! 		if ((((int)pos.col - 1 - col) & 1) == 0)
-  		{
-  		    inquote = !inquote;
-  		    start_in_quotes = FALSE;
-*** ../vim61.007/src/version.c	Thu Apr  4 22:07:48 2002
---- src/version.c	Fri Apr  5 20:10:42 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     8,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-88. Every single time you press the 'Get mail' button...it does get new mail.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.009 b/app-editors/vim/files/6.1.009
deleted file mode 100644
index 1a8886f82cfd..000000000000
--- a/app-editors/vim/files/6.1.009
+++ /dev/null
@@ -1,47 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.009
-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.009
-Problem:    Vim crashes when using a huge number for the maxwid value in a
-	    statusline. (Robert M. Nowotniak)
-Solution:   Check for an overflow that makes maxwid negative.
-Files:	    src/buffer.c
-
-
-*** ../vim61.008/src/buffer.c	Sat Mar 23 22:31:35 2002
---- src/buffer.c	Sun Apr  7 22:23:07 2002
-***************
-*** 2998,3003 ****
---- 2998,3005 ----
-  		maxwid += *s - '0';
-  		s++;
-  	    }
-+ 	    if (maxwid <= 0)	/* overflow */
-+ 		maxwid = 50;
-  	}
-  	minwid = (minwid > 50 ? 50 : minwid) * l;
-  	if (*s == '(')
-*** ../vim61.008/src/version.c	Fri Apr  5 20:13:03 2002
---- src/version.c	Sun Apr  7 22:27:04 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     9,
-  /**/
-
--- 
-From "know your smileys":
- 8-O	"Omigod!!" (done "rm -rf *" ?)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.010 b/app-editors/vim/files/6.1.010
deleted file mode 100644
index d69eb618982a..000000000000
--- a/app-editors/vim/files/6.1.010
+++ /dev/null
@@ -1,397 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.010
-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.010
-Problem:    Searching backwards for a question mark with "?\?" doesn't work.
-	    (Alan Isaac)  Same problem in ":s?\??" and ":g?\??".
-Solution:   Change the "\?" in a pattern to "?" when using "?" as delimiter.
-Files:	    src/ex_cmds.c, src/ex_docmd.c, src/proto/regexp.pro, src/regexp.c,
-	    src/search.c, src/syntax.c, src/tag.c
-
-
-*** ../vim61.009/src/ex_cmds.c	Fri Mar 22 19:29:46 2002
---- src/ex_cmds.c	Mon Apr  8 21:54:17 2002
-***************
-*** 3408,3414 ****
-  	    which_pat = RE_LAST;	    /* use last used regexp */
-  	    delimiter = *cmd++;		    /* remember delimiter character */
-  	    pat = cmd;			    /* remember start of search pat */
-! 	    cmd = skip_regexp(cmd, delimiter, p_magic);
-  	    if (cmd[0] == delimiter)	    /* end delimiter found */
-  		*cmd++ = NUL;		    /* replace it with a NUL */
-  	}
---- 3408,3414 ----
-  	    which_pat = RE_LAST;	    /* use last used regexp */
-  	    delimiter = *cmd++;		    /* remember delimiter character */
-  	    pat = cmd;			    /* remember start of search pat */
-! 	    cmd = skip_regexp(cmd, delimiter, p_magic, &eap->arg);
-  	    if (cmd[0] == delimiter)	    /* end delimiter found */
-  		*cmd++ = NUL;		    /* replace it with a NUL */
-  	}
-***************
-*** 4195,4201 ****
-  	if (delim)
-  	    ++cmd;		/* skip delimiter if there is one */
-  	pat = cmd;		/* remember start of pattern */
-! 	cmd = skip_regexp(cmd, delim, p_magic);
-  	if (cmd[0] == delim)		    /* end delimiter found */
-  	    *cmd++ = NUL;		    /* replace it with a NUL */
-      }
---- 4195,4201 ----
-  	if (delim)
-  	    ++cmd;		/* skip delimiter if there is one */
-  	pat = cmd;		/* remember start of pattern */
-! 	cmd = skip_regexp(cmd, delim, p_magic, &eap->arg);
-  	if (cmd[0] == delim)		    /* end delimiter found */
-  	    *cmd++ = NUL;		    /* replace it with a NUL */
-      }
-*** ../vim61.009/src/ex_docmd.c	Fri Mar 22 20:30:29 2002
---- src/ex_docmd.c	Mon Apr  8 21:13:43 2002
-***************
-*** 2552,2558 ****
-  		if (*arg != NUL)
-  		{
-  		    xp->xp_context = EXPAND_NOTHING;
-! 		    arg = skip_regexp(arg + 1, *arg, p_magic);
-  		}
-  	    }
-  	    return find_nextcmd(arg);
---- 2552,2558 ----
-  		if (*arg != NUL)
-  		{
-  		    xp->xp_context = EXPAND_NOTHING;
-! 		    arg = skip_regexp(arg + 1, *arg, p_magic, NULL);
-  		}
-  	    }
-  	    return find_nextcmd(arg);
-***************
-*** 2642,2648 ****
-  	    {
-  		/* skip "from" part */
-  		++arg;
-! 		arg = skip_regexp(arg, delim, p_magic);
-  	    }
-  	    /* skip "to" part */
-  	    while (arg[0] != NUL && arg[0] != delim)
---- 2642,2648 ----
-  	    {
-  		/* skip "from" part */
-  		++arg;
-! 		arg = skip_regexp(arg, delim, p_magic, NULL);
-  	    }
-  	    /* skip "to" part */
-  	    while (arg[0] != NUL && arg[0] != delim)
-***************
-*** 2968,2974 ****
-  			c = *cmd++;
-  			if (skip)	/* skip "/pat/" */
-  			{
-! 			    cmd = skip_regexp(cmd, c, (int)p_magic);
-  			    if (*cmd == c)
-  				++cmd;
-  			}
---- 2968,2974 ----
-  			c = *cmd++;
-  			if (skip)	/* skip "/pat/" */
-  			{
-! 			    cmd = skip_regexp(cmd, c, (int)p_magic, NULL);
-  			    if (*cmd == c)
-  				++cmd;
-  			}
-***************
-*** 7063,7069 ****
-      {
-  	whole = FALSE;
-  	++eap->arg;
-! 	p = skip_regexp(eap->arg, '/', p_magic);
-  	if (*p)
-  	{
-  	    *p++ = NUL;
---- 7063,7069 ----
-      {
-  	whole = FALSE;
-  	++eap->arg;
-! 	p = skip_regexp(eap->arg, '/', p_magic, NULL);
-  	if (*p)
-  	{
-  	    *p++ = NUL;
-***************
-*** 8898,8904 ****
-  	    EMSG2(_(e_invarg2), eap->arg);
-  	    return;
-  	}
-! 	end = skip_regexp(p + 1, *p, TRUE);
-  	if (!eap->skip)
-  	{
-  	    c = *end;
---- 8898,8904 ----
-  	    EMSG2(_(e_invarg2), eap->arg);
-  	    return;
-  	}
-! 	end = skip_regexp(p + 1, *p, TRUE, NULL);
-  	if (!eap->skip)
-  	{
-  	    c = *end;
-*** ../vim61.009/src/proto/regexp.pro	Fri Mar 22 21:41:20 2002
---- src/proto/regexp.pro	Mon Apr  8 21:26:55 2002
-***************
-*** 1,6 ****
-  /* regexp.c */
-  int re_multiline __ARGS((regprog_T *prog));
-! char_u *skip_regexp __ARGS((char_u *p, int dirc, int magic));
-  regprog_T *vim_regcomp __ARGS((char_u *expr, int magic));
-  int vim_regcomp_had_eol __ARGS((void));
-  int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
---- 1,6 ----
-  /* regexp.c */
-  int re_multiline __ARGS((regprog_T *prog));
-! char_u *skip_regexp __ARGS((char_u *startp, int dirc, int magic, char_u **newp));
-  regprog_T *vim_regcomp __ARGS((char_u *expr, int magic));
-  int vim_regcomp_had_eol __ARGS((void));
-  int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
-*** ../vim61.009/src/regexp.c	Mon Mar 11 21:39:06 2002
---- src/regexp.c	Mon Apr  8 21:50:54 2002
-***************
-*** 712,725 ****
-   * Stop at end of 'p' of where 'dirc' is found ('/', '?', etc).
-   * Take care of characters with a backslash in front of it.
-   * Skip strings inside [ and ].
-   */
-      char_u *
-! skip_regexp(p, dirc, magic)
-!     char_u	*p;
-      int		dirc;
-      int		magic;
-  {
-      int		mymagic;
-  
-      if (magic)
-  	mymagic = MAGIC_ON;
---- 712,730 ----
-   * Stop at end of 'p' of where 'dirc' is found ('/', '?', etc).
-   * Take care of characters with a backslash in front of it.
-   * Skip strings inside [ and ].
-+  * When "newp" is not NULL and "dirc" is '?', make an allocated copy of the
-+  * expression and change "\?" to "?".  If "*newp" is not NULL the expression
-+  * is changed in-place.
-   */
-      char_u *
-! skip_regexp(startp, dirc, magic, newp)
-!     char_u	*startp;
-      int		dirc;
-      int		magic;
-+     char_u	**newp;
-  {
-      int		mymagic;
-+     char_u	*p = startp;
-  
-      if (magic)
-  	mymagic = MAGIC_ON;
-***************
-*** 739,745 ****
-  	}
-  	else if (p[0] == '\\' && p[1] != NUL)
-  	{
-! 	    ++p;    /* skip next character */
-  	    if (*p == 'v')
-  		mymagic = MAGIC_ALL;
-  	    else if (*p == 'V')
---- 744,765 ----
-  	}
-  	else if (p[0] == '\\' && p[1] != NUL)
-  	{
-! 	    if (dirc == '?' && newp != NULL && p[1] == '?')
-! 	    {
-! 		/* change "\?" to "?", make a copy first. */
-! 		if (*newp == NULL)
-! 		{
-! 		    *newp = vim_strsave(startp);
-! 		    if (*newp != NULL)
-! 			p = *newp + (p - startp);
-! 		}
-! 		if (*newp != NULL)
-! 		    mch_memmove(p, p + 1, STRLEN(p));
-! 		else
-! 		    ++p;
-! 	    }
-! 	    else
-! 		++p;    /* skip next character */
-  	    if (*p == 'v')
-  		mymagic = MAGIC_ALL;
-  	    else if (*p == 'V')
-*** ../vim61.009/src/search.c	Fri Apr  5 20:13:03 2002
---- src/search.c	Mon Apr  8 21:40:30 2002
-***************
-*** 849,854 ****
---- 849,856 ----
-      char_u	    *p;
-      long	    c;
-      char_u	    *dircp;
-+     char_u	    *strcopy = NULL;
-+     char_u	    *ps;
-  
-      /*
-       * A line offset is not remembered, this is vi compatible.
-***************
-*** 940,946 ****
-  	     * Find end of regular expression.
-  	     * If there is a matching '/' or '?', toss it.
-  	     */
-! 	    p = skip_regexp(str, dirc, (int)p_magic);
-  	    if (*p == dirc)
-  	    {
-  		dircp = p;	/* remember where we put the NUL */
---- 942,956 ----
-  	     * Find end of regular expression.
-  	     * If there is a matching '/' or '?', toss it.
-  	     */
-! 	    ps = strcopy;
-! 	    p = skip_regexp(str, dirc, (int)p_magic, &strcopy);
-! 	    if (strcopy != ps)
-! 	    {
-! 		/* made a copy of "str" to change "\?" to "?" */
-! 		searchcmdlen += STRLEN(str) - STRLEN(strcopy);
-! 		str = strcopy;
-! 		searchstr = strcopy;
-! 	    }
-  	    if (*p == dirc)
-  	    {
-  		dircp = p;	/* remember where we put the NUL */
-***************
-*** 977,984 ****
-  		while (isdigit(*p))	    /* skip number */
-  		    ++p;
-  	    }
-! 	    searchcmdlen = (int)(p - str); /* compute length of search command
-! 							    for get_address() */
-  	    str = p;			    /* put str after search command */
-  	}
-  
---- 987,996 ----
-  		while (isdigit(*p))	    /* skip number */
-  		    ++p;
-  	    }
-! 
-! 	    /* compute length of search command for get_address() */
-! 	    searchcmdlen += (int)(p - searchstr);
-! 
-  	    str = p;			    /* put str after search command */
-  	}
-  
-***************
-*** 1074,1079 ****
---- 1086,1092 ----
-  			+ SEARCH_MSG + SEARCH_START
-  			+ ((str != NULL && *str == ';') ? 0 : SEARCH_NOOF))),
-  		RE_LAST);
-+ 
-  	if (dircp != NULL)
-  	    *dircp = dirc;	/* restore second '/' or '?' for normal_cmd() */
-  	if (c == FAIL)
-***************
-*** 1155,1160 ****
---- 1168,1175 ----
-  end_do_search:
-      if (options & SEARCH_KEEP)
-  	spats[0].off = old_off;
-+     vim_free(strcopy);
-+ 
-      return retval;
-  }
-  
-*** ../vim61.009/src/syntax.c	Thu Feb 21 21:11:38 2002
---- src/syntax.c	Mon Apr  8 21:13:54 2002
-***************
-*** 5077,5083 ****
-      if (arg == NULL || arg[1] == NUL || arg[2] == NUL)
-  	return NULL;
-  
-!     end = skip_regexp(arg + 1, *arg, TRUE);
-      if (*end != *arg)			    /* end delimiter not found */
-      {
-  	EMSG2(_("E401: Pattern delimiter not found: %s"), arg);
---- 5077,5083 ----
-      if (arg == NULL || arg[1] == NUL || arg[2] == NUL)
-  	return NULL;
-  
-!     end = skip_regexp(arg + 1, *arg, TRUE, NULL);
-      if (*end != *arg)			    /* end delimiter not found */
-      {
-  	EMSG2(_("E401: Pattern delimiter not found: %s"), arg);
-***************
-*** 5246,5252 ****
-  		finished = TRUE;
-  		break;
-  	    }
-! 	    arg_end = skip_regexp(next_arg + 1, *next_arg, TRUE);
-  	    if (*arg_end != *next_arg)	    /* end delimiter not found */
-  	    {
-  		illegal = TRUE;
---- 5246,5252 ----
-  		finished = TRUE;
-  		break;
-  	    }
-! 	    arg_end = skip_regexp(next_arg + 1, *next_arg, TRUE, NULL);
-  	    if (*arg_end != *next_arg)	    /* end delimiter not found */
-  	    {
-  		illegal = TRUE;
-*** ../vim61.009/src/tag.c	Mon Feb  4 20:34:11 2002
---- src/tag.c	Mon Apr  8 21:14:05 2002
-***************
-*** 2528,2534 ****
-  	 */
-  	str = pbuf;
-  	if (pbuf[0] == '/' || pbuf[0] == '?')
-! 	    str = skip_regexp(pbuf + 1, pbuf[0], FALSE) + 1;
-  	if (str > pbuf_end - 1)	/* search command with nothing following */
-  	{
-  	    save_p_ws = p_ws;
---- 2528,2534 ----
-  	 */
-  	str = pbuf;
-  	if (pbuf[0] == '/' || pbuf[0] == '?')
-! 	    str = skip_regexp(pbuf + 1, pbuf[0], FALSE, NULL) + 1;
-  	if (str > pbuf_end - 1)	/* search command with nothing following */
-  	{
-  	    save_p_ws = p_ws;
-***************
-*** 2914,2920 ****
-  	    str = skipdigits(str);
-  	else if (*str == '/' || *str == '?')
-  	{
-! 	    str = skip_regexp(str + 1, *str, FALSE);
-  	    if (*str != **pp)
-  		str = NULL;
-  	    else
---- 2914,2920 ----
-  	    str = skipdigits(str);
-  	else if (*str == '/' || *str == '?')
-  	{
-! 	    str = skip_regexp(str + 1, *str, FALSE, NULL);
-  	    if (*str != **pp)
-  		str = NULL;
-  	    else
-*** ../vim61.009/src/version.c	Sun Apr  7 22:34:13 2002
---- src/version.c	Mon Apr  8 22:03:34 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     10,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-93. New mail alarm on your palmtop annoys other churchgoers.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.011 b/app-editors/vim/files/6.1.011
deleted file mode 100644
index edf5951c93c5..000000000000
--- a/app-editors/vim/files/6.1.011
+++ /dev/null
@@ -1,172 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.011
-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.011
-Problem:    XIM: doesn't work correctly when 'number' is set.  Also, a focus
-	    problem when selecting candidates.
-Solution:   Fix the XIM problems. (Yasuhiro Matsumoto)
-Files:	    src/mbyte.c, src/screen.c
-
-
-*** ../vim61.010/src/mbyte.c	Sat Mar 30 17:15:14 2002
---- src/mbyte.c	Fri Apr  5 21:26:15 2002
-***************
-*** 3728,3734 ****
-      {
-  	event_queue = key_press_event_queue;
-  	processing_queued_event = TRUE;
-! 	while (event_queue != NULL)
-  	{
-  	    GdkEvent *ev = event_queue->data;
-  
---- 3728,3734 ----
-      {
-  	event_queue = key_press_event_queue;
-  	processing_queued_event = TRUE;
-! 	while (event_queue != NULL && processing_queued_event)
-  	{
-  	    GdkEvent *ev = event_queue->data;
-  
-***************
-*** 3790,3797 ****
-      int
-  xim_queue_key_press_event(GdkEvent *ev)
-  {
-!     if (preedit_buf_len <= 0 || processing_queued_event)
-  	return FALSE;
-  
-      key_press_event_queue = g_slist_append(key_press_event_queue,
-  					   gdk_event_copy(ev));
---- 3790,3799 ----
-      int
-  xim_queue_key_press_event(GdkEvent *ev)
-  {
-!     if (preedit_buf_len <= 0)
-  	return FALSE;
-+     if (processing_queued_event)
-+ 	processing_queued_event = FALSE;
-  
-      key_press_event_queue = g_slist_append(key_press_event_queue,
-  					   gdk_event_copy(ev));
-*** ../vim61.010/src/screen.c	Sat Mar 30 17:11:06 2002
---- src/screen.c	Mon Apr  8 19:50:11 2002
-***************
-*** 2418,2423 ****
---- 2418,2427 ----
-  #endif
-  #define WL_LINE		WL_SBR + 1	/* text in the line */
-      int		draw_state = WL_START;	/* what to draw next */
-+ #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
-+     int		feedback_col = 0;
-+     int		feedback_old_attr = -1;
-+ #endif
-  
-  
-      if (startrow > endrow)		/* past the end already! */
-***************
-*** 3500,3539 ****
-  		&& State == INSERT
-  		&& im_get_status()
-  		&& !p_imdisable
-! 		&& preedit_start_col != MAXCOL)
-  	{
-  	    colnr_T tcol;
-- 	    static int  bcol = 0;
-- 	    static int	old_attr = -1;
-  
-  	    getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL);
-  	    if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
-  	    {
-! 		if (old_attr == -1)
-  		{
-! 		    bcol = 0;
-! 		    old_attr = char_attr;
-  		}
-  		if (draw_feedback != NULL)
-  		{
-! 		    if (draw_feedback[bcol] & XIMReverse)
-  			char_attr = HL_INVERSE;
-! 		    else if (draw_feedback[bcol] & XIMUnderline)
-  			char_attr = HL_UNDERLINE;
-  		    else
-  			char_attr = hl_attr(HLF_V);
-  		}
-  		else
-! 		    char_attr = old_attr;
-! 		bcol++;
-  	    }
-  	    else
-  	    {
-! 		if (old_attr >= 0)
-  		{
-! 		    char_attr = old_attr;
-! 		    old_attr = -1;
-! 		    bcol = 0;
-  		}
-  	    }
-  	}
---- 3505,3543 ----
-  		&& State == INSERT
-  		&& im_get_status()
-  		&& !p_imdisable
-! 		&& preedit_start_col != MAXCOL
-! 		&& draw_state == WL_LINE)
-  	{
-  	    colnr_T tcol;
-  
-  	    getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL);
-  	    if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
-  	    {
-! 		if (feedback_old_attr == -1)
-  		{
-! 		    feedback_col = 0;
-! 		    feedback_old_attr = char_attr;
-  		}
-  		if (draw_feedback != NULL)
-  		{
-! 		    if (draw_feedback[feedback_col] & XIMReverse)
-  			char_attr = HL_INVERSE;
-! 		    else if (draw_feedback[feedback_col] & XIMUnderline)
-  			char_attr = HL_UNDERLINE;
-  		    else
-  			char_attr = hl_attr(HLF_V);
-  		}
-  		else
-! 		    char_attr = feedback_old_attr;
-! 		feedback_col++;
-  	    }
-  	    else
-  	    {
-! 		if (feedback_old_attr >= 0)
-  		{
-! 		    char_attr = feedback_old_attr;
-! 		    feedback_old_attr = -1;
-! 		    feedback_col = 0;
-  		}
-  	    }
-  	}
-*** ../vim61.010/src/version.c	Mon Apr  8 22:11:31 2002
---- src/version.c	Mon Apr  8 22:13:14 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     11,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-94. Now admit it... How many of you have made "modem noises" into
-    the phone just to see if it was possible? :-)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.012 b/app-editors/vim/files/6.1.012
deleted file mode 100644
index b84cda9139eb..000000000000
--- a/app-editors/vim/files/6.1.012
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.012
-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.012
-Problem:    A system() call might fail if fread() does CR-LF to LF
-	    translation.
-Solution:   Open the output file in binary mode. (Pavol Huhas)
-Files:	    src/misc1.c
-
-
-*** ../vim61.011/src/misc1.c	Sat Mar 30 16:59:33 2002
---- src/misc1.c	Tue Apr  9 20:11:29 2002
-***************
-*** 7058,7064 ****
-      /*
-       * read the names from the file into memory
-       */
-!     fd = mch_fopen((char *)tempname, "r");
-      if (fd == NULL)
-      {
-  	EMSG2(_(e_notopen), tempname);
---- 7058,7064 ----
-      /*
-       * read the names from the file into memory
-       */
-!     fd = mch_fopen((char *)tempname, READBIN);
-      if (fd == NULL)
-      {
-  	EMSG2(_(e_notopen), tempname);
-*** ../vim61.011/src/version.c	Mon Apr  8 22:15:17 2002
---- src/version.c	Tue Apr  9 20:16:12 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     12,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-110. You actually volunteer to become your employer's webmaster.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.013 b/app-editors/vim/files/6.1.013
deleted file mode 100644
index e3b8a3c7c09f..000000000000
--- a/app-editors/vim/files/6.1.013
+++ /dev/null
@@ -1,84 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.013
-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.013
-Problem:    Win32: The default for 'printexpr' doesn't work when there are
-	    special characters in 'printdevice'.
-Solution:   Add double quotes around the device name. (Mike Williams)
-Files:	    runtime/doc/option.txt, src/option.c
-
-
-*** ../vim61.012/runtime/doc/options.txt	Fri Mar 22 21:18:37 2002
---- runtime/doc/options.txt	Tue Apr  9 21:30:44 2002
-***************
-*** 1,4 ****
-! *options.txt*   For Vim version 6.1.  Last change: 2002 Mar 06
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
---- 1,4 ----
-! *options.txt*   For Vim version 6.1.  Last change: 2002 Apr 09
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
-***************
-*** 4095,4101 ****
-  	On MS-Windows machines the default is to copy the file to the
-  	currently specified printdevice: >
-  
-! 	    system('copy' . ' ' . v:fname_in . ' ' &printdevice)
-  			. delete(v:fname_in)
-  <
-  	On VMS machines the default is to send the file to either the default
---- 4095,4101 ----
-  	On MS-Windows machines the default is to copy the file to the
-  	currently specified printdevice: >
-  
-! 	    system('copy' . ' ' . v:fname_in . ' "' . &printdevice . '"')
-  			. delete(v:fname_in)
-  <
-  	On VMS machines the default is to send the file to either the default
-*** ../vim61.012/src/option.c	Sat Mar 30 20:03:55 2002
---- src/option.c	Tue Apr  9 21:30:01 2002
-***************
-*** 2512,2518 ****
-      /* 'printexpr' must be allocated to be able to evaluate it. */
-      set_string_default("pexpr",
-  # ifdef MSWIN
-! 	    (char_u *)"system('copy' . ' ' . v:fname_in . ' ' . &printdevice) . delete(v:fname_in)"
-  # else
-  #  ifdef VMS
-  	    (char_u *)"system('print/delete' . (&printdevice == '' ? '' : ' /queue=' . &printdevice) . ' ' . v:fname_in)"
---- 2512,2518 ----
-      /* 'printexpr' must be allocated to be able to evaluate it. */
-      set_string_default("pexpr",
-  # ifdef MSWIN
-! 	    (char_u *)"system('copy' . ' ' . v:fname_in . ' \"' . &printdevice . '\"') . delete(v:fname_in)"
-  # else
-  #  ifdef VMS
-  	    (char_u *)"system('print/delete' . (&printdevice == '' ? '' : ' /queue=' . &printdevice) . ' ' . v:fname_in)"
-*** ../vim61.012/src/version.c	Tue Apr  9 20:17:54 2002
---- src/version.c	Tue Apr  9 21:31:50 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     13,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-115. You are late picking up your kid from school and try to explain
-     to the teacher you were stuck in Web traffic.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.014 b/app-editors/vim/files/6.1.014
deleted file mode 100644
index 9c9827fd07b6..000000000000
--- a/app-editors/vim/files/6.1.014
+++ /dev/null
@@ -1,412 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.014
-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.014
-Problem:    An operator like "r" used in Visual block mode doesn't use
-	    'virtualedit' when it's set to "block".
-Solution:   Check for 'virtualedit' being active in Visual block mode when the
-	    operator was started.
-Files:	    src/ex_docmd.c, src/globals.h, src/misc2.c, src/normal.c,
-	    src/ops.c, src/undo.c
-
-
-*** ../vim61.013/src/ex_docmd.c	Mon Apr  8 22:11:31 2002
---- src/ex_docmd.c	Tue Apr  9 22:50:00 2002
-***************
-*** 6242,6247 ****
---- 6242,6250 ----
-      oa.end.lnum = eap->line2;
-      oa.line_count = eap->line2 - eap->line1 + 1;
-      oa.motion_type = MLINE;
-+ #ifdef FEAT_VIRTUALEDIT
-+     virtual_op = FALSE;
-+ #endif
-      if (eap->cmdidx != CMD_yank)	/* position cursor for undo */
-      {
-  	setpcmark();
-***************
-*** 6273,6278 ****
---- 6276,6284 ----
-  	    op_shift(&oa, FALSE, eap->amount);
-  	    break;
-      }
-+ #ifdef FEAT_VIRTUALEDIT
-+     virtual_op = MAYBE;
-+ #endif
-  }
-  
-  /*
-*** ../vim61.013/src/globals.h	Sun Mar 17 14:10:52 2002
---- src/globals.h	Tue Apr  9 22:47:26 2002
-***************
-*** 1013,1018 ****
---- 1013,1024 ----
-  			;
-  #endif
-  
-+ #ifdef FEAT_VIRTUALEDIT
-+ /* Set to TRUE when an operator is being executed with virtual editing, MAYBE
-+  * when no operator is being executed, FALSE otherwise. */
-+ EXTERN int	virtual_op INIT(= MAYBE);
-+ #endif
-+ 
-  #ifdef FEAT_SYN_HL
-  /* Display tick, incremented for each call to update_screen() */
-  EXTERN disptick_T	display_tick INIT(= 0);
-*** ../vim61.013/src/misc2.c	Sun Mar 10 14:39:46 2002
---- src/misc2.c	Tue Apr  9 22:13:46 2002
-***************
-*** 25,30 ****
---- 25,35 ----
-      int
-  virtual_active()
-  {
-+     /* While an operator is being executed we return "virtual_op", because
-+      * VIsual_active has already been reset, thus we can't check for "block"
-+      * being used. */
-+     if (virtual_op != MAYBE)
-+ 	return virtual_op;
-      return (ve_flags == VE_ALL
-  # ifdef FEAT_VISUAL
-  	    || ((ve_flags & VE_BLOCK) && VIsual_active && VIsual_mode == Ctrl_V)
-*** ../vim61.013/src/normal.c	Wed Apr  3 22:33:54 2002
---- src/normal.c	Tue Apr  9 22:35:26 2002
-***************
-*** 1434,1439 ****
---- 1434,1444 ----
-  
-  	oap->line_count = oap->end.lnum - oap->start.lnum + 1;
-  
-+ #ifdef FEAT_VIRTUALEDIT
-+ 	/* Set "virtual_op" before resetting VIsual_active. */
-+ 	virtual_op = virtual_active();
-+ #endif
-+ 
-  #ifdef FEAT_VISUAL
-  	if (VIsual_active || redo_VIsual_busy)
-  	{
-***************
-*** 1551,1557 ****
-  		oap->motion_type = MCHAR;
-  		if (VIsual_mode != Ctrl_V && *ml_get_pos(&(oap->end)) == NUL
-  # ifdef FEAT_VIRTUALEDIT
-! 			&& (include_line_break || !virtual_active())
-  # endif
-  			)
-  		{
---- 1556,1562 ----
-  		oap->motion_type = MCHAR;
-  		if (VIsual_mode != Ctrl_V && *ml_get_pos(&(oap->end)) == NUL
-  # ifdef FEAT_VIRTUALEDIT
-! 			&& (include_line_break || !virtual_op)
-  # endif
-  			)
-  		{
-***************
-*** 1631,1638 ****
-  			    && gchar_pos(&oap->end) == NUL))
-  		    && equal(oap->start, oap->end)
-  #ifdef FEAT_VIRTUALEDIT
-! 		    && !(virtual_active()
-! 			&& oap->start.coladd != oap->end.coladd)
-  #endif
-  		    );
-  	/*
---- 1636,1642 ----
-  			    && gchar_pos(&oap->end) == NUL))
-  		    && equal(oap->start, oap->end)
-  #ifdef FEAT_VIRTUALEDIT
-! 		    && !(virtual_op && oap->start.coladd != oap->end.coladd)
-  #endif
-  		    );
-  	/*
-***************
-*** 1879,1884 ****
---- 1883,1891 ----
-  	default:
-  	    clearopbeep(oap);
-  	}
-+ #ifdef FEAT_VIRTUALEDIT
-+ 	virtual_op = MAYBE;
-+ #endif
-  	if (!gui_yank)
-  	{
-  	    /*
-*** ../vim61.013/src/ops.c	Wed Apr  3 22:33:54 2002
---- src/ops.c	Tue Apr  9 22:53:15 2002
-***************
-*** 1641,1647 ****
-      else
-      {
-  #ifdef FEAT_VIRTUALEDIT
-! 	if (virtual_active())
-  	{
-  	    int		endcol = 0;
-  
---- 1641,1647 ----
-      else
-      {
-  #ifdef FEAT_VIRTUALEDIT
-! 	if (virtual_op)
-  	{
-  	    int		endcol = 0;
-  
-***************
-*** 1696,1702 ****
-  	    n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
-  
-  #ifdef FEAT_VIRTUALEDIT
-! 	    if (virtual_active())
-  	    {
-  		/* fix up things for virtualedit-delete:
-  		 * break the tabs which are going to get in our way
---- 1696,1702 ----
-  	    n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
-  
-  #ifdef FEAT_VIRTUALEDIT
-! 	    if (virtual_op)
-  	    {
-  		/* fix up things for virtualedit-delete:
-  		 * break the tabs which are going to get in our way
-***************
-*** 1717,1723 ****
-  		    curwin->w_cursor.coladd = 0;
-  	    }
-  #endif
-! 	    (void)del_bytes((long)n, restart_edit == NUL && !virtual_active());
-  	}
-  	else				/* delete characters between lines */
-  	{
---- 1717,1723 ----
-  		    curwin->w_cursor.coladd = 0;
-  	    }
-  #endif
-! 	    (void)del_bytes((long)n, restart_edit == NUL && !virtual_op);
-  	}
-  	else				/* delete characters between lines */
-  	{
-***************
-*** 1737,1743 ****
-  	    /* delete from start of line until op_end */
-  	    curwin->w_cursor.col = 0;
-  	    (void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive),
-! 				    restart_edit == NUL && !virtual_active());
-  	    curwin->w_cursor = curpos;		/* restore curwin->w_cursor */
-  
-  	    (void)do_join(FALSE);
---- 1737,1743 ----
-  	    /* delete from start of line until op_end */
-  	    curwin->w_cursor.col = 0;
-  	    (void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive),
-! 				    restart_edit == NUL && !virtual_op);
-  	    curwin->w_cursor = curpos;		/* restore curwin->w_cursor */
-  
-  	    (void)do_join(FALSE);
-***************
-*** 1846,1852 ****
-  	for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
-  	{
-  	    block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
-! 	    if (bd.textlen == 0 && !virtual_active())	/* nothing to delete */
-  		continue;
-  
-  	    /* n == number of extra chars required
---- 1846,1852 ----
-  	for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
-  	{
-  	    block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
-! 	    if (bd.textlen == 0 && !virtual_op)	/* nothing to delete */
-  		continue;
-  
-  	    /* n == number of extra chars required
-***************
-*** 1856,1862 ****
-  #ifdef FEAT_VIRTUALEDIT
-  	    /* If the range starts in virtual space, count the initial
-  	     * coladd offset as part of "startspaces" */
-! 	    if (virtual_active() && bd.is_short && *bd.textstart == NUL)
-  	    {
-  		pos_T vpos;
-  
---- 1856,1862 ----
-  #ifdef FEAT_VIRTUALEDIT
-  	    /* If the range starts in virtual space, count the initial
-  	     * coladd offset as part of "startspaces" */
-! 	    if (virtual_op && bd.is_short && *bd.textstart == NUL)
-  	    {
-  		pos_T vpos;
-  
-***************
-*** 1877,1883 ****
-  		    && bd.end_char_vcols > 0 ? bd.end_char_vcols - 1 : 0);
-  	    /* Figure out how many characters to replace. */
-  	    numc = oap->end_vcol - oap->start_vcol + 1;
-! 	    if (bd.is_short && (!virtual_active() || bd.is_MAX))
-  		numc -= (oap->end_vcol - bd.end_vcol) + 1;
-  	    /* oldlen includes textlen, so don't double count */
-  	    n += numc - bd.textlen;
---- 1877,1883 ----
-  		    && bd.end_char_vcols > 0 ? bd.end_char_vcols - 1 : 0);
-  	    /* Figure out how many characters to replace. */
-  	    numc = oap->end_vcol - oap->start_vcol + 1;
-! 	    if (bd.is_short && (!virtual_op || bd.is_MAX))
-  		numc -= (oap->end_vcol - bd.end_vcol) + 1;
-  	    /* oldlen includes textlen, so don't double count */
-  	    n += numc - bd.textlen;
-***************
-*** 1955,1968 ****
-  			coladvance_force(getviscol());
-  			if (curwin->w_cursor.lnum == oap->end.lnum)
-  			    getvpos(&oap->end, end_vcol);
-- 			pchar(curwin->w_cursor, c);
-  		    }
-  #endif
-  		    pchar(curwin->w_cursor, c);
-  		}
-  	    }
-  #ifdef FEAT_VIRTUALEDIT
-! 	    else if (virtual_active() && curwin->w_cursor.lnum == oap->end.lnum)
-  	    {
-  		int virtcols = oap->end.coladd;
-  
---- 1955,1967 ----
-  			coladvance_force(getviscol());
-  			if (curwin->w_cursor.lnum == oap->end.lnum)
-  			    getvpos(&oap->end, end_vcol);
-  		    }
-  #endif
-  		    pchar(curwin->w_cursor, c);
-  		}
-  	    }
-  #ifdef FEAT_VIRTUALEDIT
-! 	    else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum)
-  	    {
-  		int virtcols = oap->end.coladd;
-  
-***************
-*** 2329,2335 ****
-  	return FALSE;
-  
-      if ((l > curwin->w_cursor.col) && !lineempty(curwin->w_cursor.lnum)
-! 							 && !virtual_active())
-  	inc_cursor();
-  
-  #ifdef FEAT_VISUALEXTRA
---- 2328,2334 ----
-  	return FALSE;
-  
-      if ((l > curwin->w_cursor.col) && !lineempty(curwin->w_cursor.lnum)
-! 							 && !virtual_op)
-  	inc_cursor();
-  
-  #ifdef FEAT_VISUALEXTRA
-***************
-*** 2592,2598 ****
-  		    {
-  			startcol = oap->start.col;
-  #ifdef FEAT_VIRTUALEDIT
-! 			if (virtual_active())
-  			{
-  			    getvcol(curwin, &oap->start, &cs, NUL, &ce);
-  			    if (ce != cs && oap->start.coladd > 0)
---- 2591,2597 ----
-  		    {
-  			startcol = oap->start.col;
-  #ifdef FEAT_VIRTUALEDIT
-! 			if (virtual_op)
-  			{
-  			    getvcol(curwin, &oap->start, &cs, NUL, &ce);
-  			    if (ce != cs && oap->start.coladd > 0)
-***************
-*** 2611,2617 ****
-  		    {
-  			endcol = oap->end.col;
-  #ifdef FEAT_VIRTUALEDIT
-! 			if (virtual_active())
-  			{
-  			    getvcol(curwin, &oap->end, &cs, NUL, &ce);
-  			    if (p[endcol] == NUL || (cs + oap->end.coladd < ce
---- 2610,2616 ----
-  		    {
-  			endcol = oap->end.col;
-  #ifdef FEAT_VIRTUALEDIT
-! 			if (virtual_op)
-  			{
-  			    getvcol(curwin, &oap->end, &cs, NUL, &ce);
-  			    if (p[endcol] == NUL || (cs + oap->end.coladd < ce
-***************
-*** 4378,4384 ****
-  		 * Disadvantage: can lead to trailing spaces when the line is
-  		 * short where the text is put */
-  		/* if (!is_del || oap->op_type == OP_APPEND) */
-! 		if (oap->op_type == OP_APPEND || virtual_active())
-  		    bdp->endspaces = oap->end_vcol - bdp->end_vcol
-  					+ oap->inclusive;
-  		else
---- 4377,4383 ----
-  		 * Disadvantage: can lead to trailing spaces when the line is
-  		 * short where the text is put */
-  		/* if (!is_del || oap->op_type == OP_APPEND) */
-! 		if (oap->op_type == OP_APPEND || virtual_op)
-  		    bdp->endspaces = oap->end_vcol - bdp->end_vcol
-  					+ oap->inclusive;
-  		else
-***************
-*** 5527,5533 ****
---- 5526,5538 ----
-  		switch (VIsual_mode)
-  		{
-  		    case Ctrl_V:
-+ # ifdef FEAT_VIRTUALEDIT
-+ 			virtual_op = virtual_active();
-+ # endif
-  			block_prep(&oparg, &bd, lnum, 0);
-+ # ifdef FEAT_VIRTUALEDIT
-+ 			virtual_op = MAYBE;
-+ # endif
-  			char_count_cursor += line_count_info(bd.textstart,
-  				&word_count_cursor, (long)bd.textlen, eol_size);
-  			break;
-*** ../vim61.013/src/undo.c	Sun Feb 17 19:50:52 2002
---- src/undo.c	Tue Apr  9 22:22:46 2002
-***************
-*** 667,673 ****
-      {
-  	curwin->w_cursor.col = curbuf->b_u_curhead->uh_cursor.col;
-  #ifdef FEAT_VIRTUALEDIT
-! 	if (curbuf->b_u_curhead->uh_cursor_vcol >= 0)
-  	    coladvance((colnr_T)curbuf->b_u_curhead->uh_cursor_vcol);
-  	else
-  	    curwin->w_cursor.coladd = 0;
---- 667,673 ----
-      {
-  	curwin->w_cursor.col = curbuf->b_u_curhead->uh_cursor.col;
-  #ifdef FEAT_VIRTUALEDIT
-! 	if (virtual_active() && curbuf->b_u_curhead->uh_cursor_vcol >= 0)
-  	    coladvance((colnr_T)curbuf->b_u_curhead->uh_cursor_vcol);
-  	else
-  	    curwin->w_cursor.coladd = 0;
-*** ../vim61.013/src/version.c	Tue Apr  9 21:34:55 2002
---- src/version.c	Tue Apr  9 22:35:52 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     14,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-120. You ask a friend, "What's that big shiny thing?" He says, "It's the sun."
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.015 b/app-editors/vim/files/6.1.015
deleted file mode 100644
index 89f549ff8594..000000000000
--- a/app-editors/vim/files/6.1.015
+++ /dev/null
@@ -1,46 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.015
-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.015
-Problem:    After patch 6.1.014 can't compile with tiny features. (Christian
-	    J. Robinson)
-Solution:   Add the missing define of virtual_op.
-Files:	    src/vim.h
-
-
-*** ../vim61.014/src/vim.h	Tue Mar 12 21:23:45 2002
---- src/vim.h	Tue Apr  9 22:16:23 2002
-***************
-*** 1527,1532 ****
---- 1527,1533 ----
-  #ifndef FEAT_VIRTUALEDIT
-  # define getvvcol(w, p, s, c, e) getvcol(w, p, s, c, e)
-  # define virtual_active() 0
-+ # define virtual_op FALSE
-  #endif
-  
-  /*
-*** ../vim61.014/src/version.c	Tue Apr  9 23:19:52 2002
---- src/version.c	Wed Apr 10 10:33:44 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     15,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-124. You begin conversations with, "Who is your internet service provider?"
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.017 b/app-editors/vim/files/6.1.017
deleted file mode 100644
index 9fbf046eefa6..000000000000
--- a/app-editors/vim/files/6.1.017
+++ /dev/null
@@ -1,45 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.017
-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.017
-Problem:    Cygwin: After patch 6.1.012 Still doesn't do binary file I/O.
-	    (Pavol Juhas)
-Solution:   Define BINARY_FILE_IO for Cygwin.
-Files:	    src/os_unix.h
-
-
-*** ../vim61.016/src/os_unix.h	Mon Feb  4 15:03:27 2002
---- src/os_unix.h	Wed Apr 10 10:19:16 2002
-***************
-*** 39,44 ****
---- 39,45 ----
-  
-  #if defined(__CYGWIN__) || defined(__CYGWIN32__)
-  # define WIN32UNIX	/* Compiling for Win32 using Unix files. */
-+ # define BINARY_FILE_IO
-  #endif
-  
-  /* On AIX 4.2 there is a conflicting prototype for ioctl() in stropts.h and
-*** ../vim61.016/src/version.c	Wed Apr 10 21:37:12 2002
---- src/version.c	Thu Apr 11 21:39:21 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     17,
-  /**/
-
--- 
-Send $25.00 for handy leaflet on how to make money selling leaflets
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.018 b/app-editors/vim/files/6.1.018
deleted file mode 100644
index bce2b35a6c70..000000000000
--- a/app-editors/vim/files/6.1.018
+++ /dev/null
@@ -1,70 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.018
-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.018
-Problem:    Error message when using cterm highlighting. (Leonardo Di Lella)
-Solution:   Remove a backslash before a question mark.
-Files:	    runtime/syntax/cterm.vim
-
-
-*** ../vim61.017/runtime/syntax/cterm.vim	Sun Sep  2 14:44:54 2001
---- runtime/syntax/cterm.vim	Sat Apr 13 17:19:47 2002
-***************
-*** 1,7 ****
-  " Vim syntax file
-  " Language:	Century Term Command Script
-  " Maintainer:	Sean M. McKee <mckee@misslink.net>
-! " Last Change:	2001 Sep 02
-  " Version Info: @(#)cterm.vim	1.7	97/12/15 09:23:14
-  
-  " For version 5.x: Clear all syntax items
---- 1,7 ----
-  " Vim syntax file
-  " Language:	Century Term Command Script
-  " Maintainer:	Sean M. McKee <mckee@misslink.net>
-! " Last Change:	2002 Apr 13
-  " Version Info: @(#)cterm.vim	1.7	97/12/15 09:23:14
-  
-  " For version 5.x: Clear all syntax items
-***************
-*** 39,45 ****
-  syn keyword ctermFunction	vi vidblink vidcard vidout vidunder wait
-  syn keyword ctermFunction	wildsize wclose wopen wordlen wru wruchar
-  syn keyword ctermFunction	xfer xmit xprot
-! syn match ctermFunction		"\?"
-  "syn keyword ctermFunction	comment remark
-  
-  "END FUNCTIONS
---- 39,45 ----
-  syn keyword ctermFunction	vi vidblink vidcard vidout vidunder wait
-  syn keyword ctermFunction	wildsize wclose wopen wordlen wru wruchar
-  syn keyword ctermFunction	xfer xmit xprot
-! syn match ctermFunction		"?"
-  "syn keyword ctermFunction	comment remark
-  
-  "END FUNCTIONS
-*** ../vim61.017/src/version.c	Thu Apr 11 21:42:20 2002
---- src/version.c	Sat Apr 13 19:29:27 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     18,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-181. You make up words that go with the "happy tune" your modem makes
-     while dialing your ISP.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.020 b/app-editors/vim/files/6.1.020
deleted file mode 100644
index dc1182b60e43..000000000000
--- a/app-editors/vim/files/6.1.020
+++ /dev/null
@@ -1,58 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.020
-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.020
-Problem:    col("'>") returns a huge number after using Visual line mode.
-Solution:   Return the length of the line instead.
-Files:      src/eval.c
-
-
-*** ../vim61.019/src/eval.c	Tue Mar 12 17:59:58 2002
---- src/eval.c	Sun Apr 21 15:41:37 2002
-***************
-*** 3096,3102 ****
-      if (fp != NULL)
-      {
-  	if (fp->col == MAXCOL)
-! 	    col = MAXCOL;
-  	else
-  	{
-  	    col = fp->col + 1;
---- 3096,3108 ----
-      if (fp != NULL)
-      {
-  	if (fp->col == MAXCOL)
-! 	{
-! 	    /* '> can be MAXCOL, get the length of the line then */
-! 	    if (fp->lnum <= curbuf->b_ml.ml_line_count)
-! 		col = STRLEN(ml_get(fp->lnum)) + 1;
-! 	    else
-! 		col = MAXCOL;
-! 	}
-  	else
-  	{
-  	    col = fp->col + 1;
-*** ../vim61.019/src/version.c	Sat Apr 20 21:50:49 2002
---- src/version.c	Sun Apr 21 15:44:16 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     20,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-262. Your computer has it's own phone line - but your daughter doesn't.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.021 b/app-editors/vim/files/6.1.021
deleted file mode 100644
index b3b12b5d5feb..000000000000
--- a/app-editors/vim/files/6.1.021
+++ /dev/null
@@ -1,90 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.021
-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.021 (depends on patch 6.1.009)
-Problem:    Vim crashes when using a huge number for the minwid value in a
-	    statusline. (Robert M. Nowotniak)
-Solution:   Check for an overflow that makes minwid negative.
-Files:	    src/buffer.c
-
-
-*** ../vim61.020/src/buffer.c	Sun Apr  7 22:34:13 2002
---- src/buffer.c	Mon Apr  8 19:58:50 2002
-***************
-*** 2972,2982 ****
-  	    s++;
-  	    l = -1;
-  	}
-! 	while (*s && isdigit(*s))
-  	{
-! 	    minwid *= 10;
-! 	    minwid += *s - '0';
-! 	    s++;
-  	}
-  	if (*s == STL_HIGHLIGHT)
-  	{
---- 2972,2982 ----
-  	    s++;
-  	    l = -1;
-  	}
-! 	if (isdigit(*s))
-  	{
-! 	    minwid = (int)getdigits(&s);
-! 	    if (minwid < 0)	/* overflow */
-! 		minwid = 0;
-  	}
-  	if (*s == STL_HIGHLIGHT)
-  	{
-***************
-*** 2991,3005 ****
-  	{
-  	    s++;
-  	    if (isdigit(*s))
-- 		maxwid = 0;
-- 	    while (*s && isdigit(*s))
-  	    {
-! 		maxwid *= 10;
-! 		maxwid += *s - '0';
-! 		s++;
-  	    }
-- 	    if (maxwid <= 0)	/* overflow */
-- 		maxwid = 50;
-  	}
-  	minwid = (minwid > 50 ? 50 : minwid) * l;
-  	if (*s == '(')
---- 2991,3001 ----
-  	{
-  	    s++;
-  	    if (isdigit(*s))
-  	    {
-! 		maxwid = (int)getdigits(&s);
-! 		if (maxwid <= 0)	/* overflow */
-! 		    maxwid = 50;
-  	    }
-  	}
-  	minwid = (minwid > 50 ? 50 : minwid) * l;
-  	if (*s == '(')
-*** ../vim61.020/src/version.c	Sun Apr 21 15:46:47 2002
---- src/version.c	Sun Apr 21 15:48:39 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     21,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-263. You have more e-mail addresses than shorts.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.022 b/app-editors/vim/files/6.1.022
deleted file mode 100644
index 00cb36a845f7..000000000000
--- a/app-editors/vim/files/6.1.022
+++ /dev/null
@@ -1,120 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.022
-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.022
-Problem:    Grabbing the status line above the command-line window works like
-	    the bottom status line was grabbed. (Jim Battle)
-Solution:   Make it possible to grab the status line above the command-line
-	    window, so that it can be resized.
-Files:	    src/ui.c
-
-
-*** ../vim61.021/src/ui.c	Sat Mar  9 16:17:41 2002
---- src/ui.c	Sun Apr 21 16:43:51 2002
-***************
-*** 2161,2166 ****
---- 2161,2170 ----
-  #endif
-      static int	prev_row = -1;
-      static int	prev_col = -1;
-+ #ifdef FEAT_CMDWIN
-+     static int  drag_prev_win = FALSE;	/* dragging status line above
-+ 					   command-line window */
-+ #endif
-  
-      win_T	*wp, *old_curwin;
-      pos_T	old_cursor;
-***************
-*** 2283,2300 ****
-  	}
-  #endif
-  #ifdef FEAT_CMDWIN
-  	if (cmdwin_type != 0 && wp != curwin)
-  	{
-  	    /* A click outside the command-line window: Use modeless
-! 	     * selection if possible. */
-  # ifdef FEAT_CLIPBOARD
-  	    return IN_OTHER_WIN;
-  # else
-  	    row = 0;
-  	    col += wp->w_wincol;
-  	    wp = curwin;
-- 	    on_status_line = 0;
-- 	    on_sep_line = 0;
-  # endif
-  	}
-  #endif
---- 2287,2311 ----
-  	}
-  #endif
-  #ifdef FEAT_CMDWIN
-+ 	drag_prev_win = FALSE;
-  	if (cmdwin_type != 0 && wp != curwin)
-  	{
-  	    /* A click outside the command-line window: Use modeless
-! 	     * selection if possible.  Allow dragging the status line of the
-! 	     * window just above the command-line window. */
-! 	    if (wp == curwin->w_prev)
-! 		drag_prev_win = TRUE;
-! 	    else
-! 		on_status_line = 0;
-! 	    on_sep_line = 0;
-  # ifdef FEAT_CLIPBOARD
-+ 	    if (drag_prev_win)
-+ 		return IN_STATUS_LINE;
-  	    return IN_OTHER_WIN;
-  # else
-  	    row = 0;
-  	    col += wp->w_wincol;
-  	    wp = curwin;
-  # endif
-  	}
-  #endif
-***************
-*** 2337,2345 ****
---- 2348,2367 ----
-      else if (on_status_line && which_button == MOUSE_LEFT)
-      {
-  #ifdef FEAT_WINDOWS
-+ 	wp = curwin;
-+ # ifdef FEAT_CMDWIN
-+ 	if (cmdwin_type != 0 && drag_prev_win && curwin->w_prev != NULL)
-+ 	    /* Drag the status line of the window above the command-line
-+ 	     * window. */
-+ 	    curwin = curwin->w_prev;
-+ # endif
-  	/* Drag the status line */
-  	count = row - curwin->w_winrow - curwin->w_height + 1 - on_status_line;
-  	win_drag_status_line(count);
-+ 
-+ # ifdef FEAT_CMDWIN
-+ 	curwin = wp;
-+ # endif
-  #endif
-  	return IN_STATUS_LINE;			/* Cursor didn't move */
-      }
-*** ../vim61.021/src/version.c	Sun Apr 21 15:51:07 2002
---- src/version.c	Sun Apr 21 16:47:26 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     22,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-264. You turn to the teletext page "surfing report" and are surprised that it
-     is about sizes of waves and a weather forecast for seaside resorts.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.024 b/app-editors/vim/files/6.1.024
deleted file mode 100644
index 8df52321d6fb..000000000000
--- a/app-editors/vim/files/6.1.024
+++ /dev/null
@@ -1,60 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.024
-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.024
-Problem:    When header files use a new syntax for declaring functions, Vim
-	    can't figure out missing prototypes properly.
-Solution:   Accept braces around a function name. (M. Warner Losh)
-Files:	    src/osdef.sh
-
-
-*** ../vim61.023/src/osdef.sh	Sun Jun 11 23:36:49 2000
---- src/osdef.sh	Tue Apr  9 20:28:37 2002
-***************
-*** 47,56 ****
-  # start of the line is matched with "[)*, 	]\1[ 	(]"
-  sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
-  
-! sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	]\1[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
-  
-! sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	]\1[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
-  
-  cat << EOF > osdef2.sed
---- 47,56 ----
-  # start of the line is matched with "[)*, 	]\1[ 	(]"
-  sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
-  
-! sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	][(]*\1[)]*[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
-  
-! sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* 	][)* 	]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, 	][(]*\1[)]*[ 	(]/i\\\
-  \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
-  
-  cat << EOF > osdef2.sed
-*** ../vim61.023/src/version.c	Sun Apr 21 16:58:37 2002
---- src/version.c	Sun Apr 21 20:06:40 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     24,
-  /**/
-
--- 
-ARTHUR: This new learning amazes me, Sir Bedevere.  Explain again how sheep's
-        bladders may be employed to prevent earthquakes.
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.025 b/app-editors/vim/files/6.1.025
deleted file mode 100644
index 3d3f97b0ac53..000000000000
--- a/app-editors/vim/files/6.1.025
+++ /dev/null
@@ -1,94 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.025
-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.025
-Problem:    Five messages for "vim --help" don't start with a capital. (Vlad
-	    Sandrini)
-Solution:   Make the messages consistent.
-Files:	    src/main.c
-
-
-*** ../vim61.024/src/main.c	Sun Mar 24 12:05:17 2002
---- src/main.c	Fri Apr 12 22:53:25 2002
-***************
-*** 2303,2312 ****
-      main_msg(_("-dev <device>\t\tUse <device> for I/O"));
-  #endif
-  #ifdef FEAT_RIGHTLEFT
-!     main_msg(_("-H\t\t\tstart in Hebrew mode"));
-  #endif
-  #ifdef FEAT_FKMAP
-!     main_msg(_("-F\t\t\tstart in Farsi mode"));
-  #endif
-      main_msg(_("-T <terminal>\tSet terminal type to <terminal>"));
-      main_msg(_("-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"));
---- 2303,2312 ----
-      main_msg(_("-dev <device>\t\tUse <device> for I/O"));
-  #endif
-  #ifdef FEAT_RIGHTLEFT
-!     main_msg(_("-H\t\t\tStart in Hebrew mode"));
-  #endif
-  #ifdef FEAT_FKMAP
-!     main_msg(_("-F\t\t\tStart in Farsi mode"));
-  #endif
-      main_msg(_("-T <terminal>\tSet terminal type to <terminal>"));
-      main_msg(_("-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"));
-***************
-*** 2315,2321 ****
-  #endif
-      main_msg(_("--noplugin\t\tDon't load plugin scripts"));
-      main_msg(_("-o[N]\t\tOpen N windows (default: one for each file)"));
-!     main_msg(_("-O[N]\t\tlike -o but split vertically"));
-      main_msg(_("+\t\t\tStart at end of file"));
-      main_msg(_("+<lnum>\t\tStart at line <lnum>"));
-  #ifdef FEAT_PRECOMMANDS
---- 2315,2321 ----
-  #endif
-      main_msg(_("--noplugin\t\tDon't load plugin scripts"));
-      main_msg(_("-o[N]\t\tOpen N windows (default: one for each file)"));
-!     main_msg(_("-O[N]\t\tLike -o but split vertically"));
-      main_msg(_("+\t\t\tStart at end of file"));
-      main_msg(_("+<lnum>\t\tStart at line <lnum>"));
-  #ifdef FEAT_PRECOMMANDS
-***************
-*** 2349,2356 ****
-  #ifdef FEAT_VIMINFO
-      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
-  #endif
-!     main_msg(_("-h\t\t\tprint Help (this message) and exit"));
-!     main_msg(_("--version\t\tprint version information and exit"));
-  
-  #ifdef FEAT_GUI_X11
-  # ifdef FEAT_GUI_MOTIF
---- 2349,2356 ----
-  #ifdef FEAT_VIMINFO
-      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
-  #endif
-!     main_msg(_("-h\t\t\tPrint Help (this message) and exit"));
-!     main_msg(_("--version\t\tPrint version information and exit"));
-  
-  #ifdef FEAT_GUI_X11
-  # ifdef FEAT_GUI_MOTIF
-*** ../vim61.024/src/version.c	Sun Apr 21 20:24:17 2002
---- src/version.c	Sun Apr 21 20:26:25 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     25,
-  /**/
-
--- 
-Women are probably the main cause of free software starvation.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.026 b/app-editors/vim/files/6.1.026
deleted file mode 100644
index dd758fb0989c..000000000000
--- a/app-editors/vim/files/6.1.026
+++ /dev/null
@@ -1,137 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.026
-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.026
-Problem:    *.patch files are not recognized as diff files.  In a script a
-	    "VAR=val" argument after "env" isn't ignored.  PHP scripts are not
-	    recognized.
-Solution:   Add *.patch for diff filetypes.  Ignore "VAR=val".  Recognize PHP
-	    scripts. (Roman Neuhauser)
-Files:	    runtime/filetype.vim, runtime/scripts.vim
-
-
-*** ../vim61.025/runtime/filetype.vim	Sun Mar 24 13:47:54 2002
---- runtime/filetype.vim	Tue Apr 23 20:08:25 2002
-***************
-*** 1,7 ****
-  " Vim support file to detect file types
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2002 Mar 24
-  
-  " Listen very carefully, I will say this only once
-  if exists("did_load_filetypes")
---- 1,7 ----
-  " Vim support file to detect file types
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2002 Apr 23
-  
-  " Listen very carefully, I will say this only once
-  if exists("did_load_filetypes")
-***************
-*** 335,342 ****
-  " Debian Control
-  au BufNewFile,BufRead */debian/control		setf debcontrol
-  
-  " Diff files
-! au BufNewFile,BufRead *.diff,*.rej		setf diff
-  
-  " Diva (with Skill) or InstallShield
-  au BufNewFile,BufRead *.rul
---- 335,345 ----
-  " Debian Control
-  au BufNewFile,BufRead */debian/control		setf debcontrol
-  
-+ " ROCKLinux package description
-+ au BufNewFile,BufRead *.desc			setf desc
-+ 
-  " Diff files
-! au BufNewFile,BufRead *.diff,*.rej,*.patch	setf diff
-  
-  " Diva (with Skill) or InstallShield
-  au BufNewFile,BufRead *.rul
-*** ../vim61.025/runtime/scripts.vim	Thu Mar 21 21:52:55 2002
---- runtime/scripts.vim	Sun Apr 14 13:30:29 2002
-***************
-*** 1,7 ****
-  " Vim support file to detect file types in scripts
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2002 Mar 21
-  
-  " This file is called by an autocommand for every file that has just been
-  " loaded into a buffer.  It checks if the type of file can be recognized by
---- 1,7 ----
-  " Vim support file to detect file types in scripts
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2002 Apr 14
-  
-  " This file is called by an autocommand for every file that has just been
-  " loaded into a buffer.  It checks if the type of file can be recognized by
-***************
-*** 31,39 ****
-  if s:line1 =~ "^#!"
-    " A script that starts with "#!".
-  
-!   " Check for a line like "#!/usr/bin/env bash".  Turn it into
-    " "#!/usr/bin/bash" to make matching easier.
-    if s:line1 =~ '^#!\s*\S*\<env\s'
-      let s:line1 = substitute(s:line1, '\<env\s\+', '', '')
-    endif
-  
---- 31,40 ----
-  if s:line1 =~ "^#!"
-    " A script that starts with "#!".
-  
-!   " Check for a line like "#!/usr/bin/env VAR=val bash".  Turn it into
-    " "#!/usr/bin/bash" to make matching easier.
-    if s:line1 =~ '^#!\s*\S*\<env\s'
-+     let s:line1 = substitute(s:line1, '\S\+=\S\+', '', 'g')
-      let s:line1 = substitute(s:line1, '\<env\s\+', '', '')
-    endif
-  
-***************
-*** 81,86 ****
---- 82,91 ----
-    elseif s:name =~ 'perl'
-      set ft=perl
-  
-+     " PHP
-+   elseif s:name =~ 'php'
-+     set ft=php
-+ 
-      " Python
-    elseif s:name =~ 'python'
-      set ft=python
-*** ../vim61.025/src/version.c	Sun Apr 21 20:28:48 2002
---- src/version.c	Tue Apr 23 21:19:15 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     26,
-  /**/
-
--- 
-   An extraordinary TALL KNIGHT in all black (possibly John with Mike on his
-   shoulders) walks out from the dark trees.  He is extremely fierce and
-   gruesome countenance.  He walks towards KING ARTHUR and PATSY, who are
-   wazzing like mad.  (Salopian slang, meaning very scared.  almost to the
-   point of wetting oneself, e.g. before an important football match or
-   prior to a postering.  Salopian slang meaning a beating by the school
-   praeposters.  Sorry about the Salopian slant to this stage direction - Ed.)
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.027 b/app-editors/vim/files/6.1.027
deleted file mode 100644
index fd57d61e6107..000000000000
--- a/app-editors/vim/files/6.1.027
+++ /dev/null
@@ -1,49 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.027
-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.027
-Problem:    When 'foldcolumn' is non-zero, a special character that wraps to
-	    the next line disturbs the foldcolumn highlighting.  (Yasuhiro
-	    Matsumoto)
-Solution:   Only use the special highlighting when drawing text characters.
-Files:	    src/screen.c
-
-
-*** ../vim61.026/src/screen.c	Mon Apr  8 22:15:17 2002
---- src/screen.c	Tue Apr 23 20:24:48 2002
-***************
-*** 3494,3499 ****
---- 3494,3500 ----
-  
-  	/* Don't override visual selection highlighting. */
-  	if (n_attr > 0
-+ 		&& draw_state == WL_LINE
-  		&& (area_attr == 0 || char_attr != area_attr)
-  		&& (search_attr == 0 || char_attr != search_attr))
-  	    char_attr = extra_attr;
-*** ../vim61.026/src/version.c	Tue Apr 23 21:22:42 2002
---- src/version.c	Tue Apr 23 21:56:43 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     27,
-  /**/
-
--- 
-ARTHUR:      Who are you?
-TALL KNIGHT: We are the Knights Who Say "Ni"!
-BEDEVERE:    No!  Not the Knights Who Say "Ni"!
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.028 b/app-editors/vim/files/6.1.028
deleted file mode 100644
index 2b598cb977d1..000000000000
--- a/app-editors/vim/files/6.1.028
+++ /dev/null
@@ -1,86 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.028
-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.028
-Problem:    Client-server: When a --remote-expr fails, Vim still exits with
-	    status zero.
-Solution:   Exit Vim with a non-zero status to indicate the --remote-expr
-	    failed. (Thomas Scott Urban)
-Files:	    src/main.c
-
-
-*** ../vim61.027/src/main.c	Sun Apr 21 20:28:48 2002
---- src/main.c	Tue Apr 23 22:01:40 2002
-***************
-*** 2543,2548 ****
---- 2544,2550 ----
-      char_u	*sname;
-      int		ret;
-      int		didone = FALSE;
-+     int		exiterr = 0;
-      char	**newArgV = argv + 1;
-      int		newArgC = 1,
-  		Argc = *argc;
-***************
-*** 2620,2625 ****
---- 2622,2628 ----
-  		    {
-  			/* Probably out of memory, exit. */
-  			didone = TRUE;
-+ 			exiterr = 1;
-  			break;
-  		    }
-  		    Argc = i;
-***************
-*** 2637,2642 ****
---- 2640,2646 ----
-  			/* Failed to send, abort. */
-  			mch_errmsg(_("\nSend failed.\n"));
-  			didone = TRUE;
-+ 			exiterr = 1;
-  		    }
-  		    else if (!silent)
-  			/* Let vim start normally.  */
-***************
-*** 2752,2758 ****
-  	if (didone)
-  	{
-  	    display_errors();	/* display any collected messages */
-! 	    exit(0);		/* Mission accomplished - get out */
-  	}
-      }
-      /* Return back into main() */
---- 2756,2762 ----
-  	if (didone)
-  	{
-  	    display_errors();	/* display any collected messages */
-! 	    exit(exiterr);	/* Mission accomplished - get out */
-  	}
-      }
-      /* Return back into main() */
-*** ../vim61.027/src/version.c	Tue Apr 23 21:59:06 2002
---- src/version.c	Tue Apr 23 22:00:41 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     28,
-  /**/
-
--- 
-TALL KNIGHT: We shall say Ni! again to you if you do not appease us.
-ARTHUR:      All right!  What do you want?
-TALL KNIGHT: We want ... a shrubbery!
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.029 b/app-editors/vim/files/6.1.029
deleted file mode 100644
index f19e5dbae77b..000000000000
--- a/app-editors/vim/files/6.1.029
+++ /dev/null
@@ -1,73 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.029
-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.029
-Problem:    When 'encoding' is an 8-bit encoding other than "latin1", editing
-	    a utf-8 or other Unicode file uses the wrong conversion. (Jan
-	    Fedak)
-Solution:   Don't use Unicode to latin1 conversion for 8-bit encodings other
-	    than "latin1".
-Files:	    src/fileio.c
-
-
-*** ../vim61.028/src/fileio.c	Tue Mar 19 22:34:17 2002
---- src/fileio.c	Tue Apr 23 20:49:02 2002
-***************
-*** 847,853 ****
-  	 * conversion to UTF-8 except how the resulting character is put in
-  	 * the buffer.
-  	 */
-! 	else if (enc_utf8 || !has_mbyte)
-  	    fio_flags = get_fio_flags(fenc);
-  
-  # ifdef USE_ICONV
---- 847,853 ----
-  	 * conversion to UTF-8 except how the resulting character is put in
-  	 * the buffer.
-  	 */
-! 	else if (enc_utf8 || STRCMP(p_enc, "latin1") == 0)
-  	    fio_flags = get_fio_flags(fenc);
-  
-  # ifdef USE_ICONV
-***************
-*** 3113,3119 ****
-       * Latin1 to Unicode conversion.  This is handled in buf_write_bytes().
-       * Prepare the flags for it and allocate bw_conv_buf when needed.
-       */
-!     if (converted && (enc_utf8 || !has_mbyte))
-      {
-  	wb_flags = get_fio_flags(fenc);
-  	if (wb_flags & (FIO_UCS2 | FIO_UCS4 | FIO_UTF16 | FIO_UTF8))
---- 3113,3119 ----
-       * Latin1 to Unicode conversion.  This is handled in buf_write_bytes().
-       * Prepare the flags for it and allocate bw_conv_buf when needed.
-       */
-!     if (converted && (enc_utf8 || STRCMP(p_enc, "latin1") == 0))
-      {
-  	wb_flags = get_fio_flags(fenc);
-  	if (wb_flags & (FIO_UCS2 | FIO_UCS4 | FIO_UTF16 | FIO_UTF8))
-*** ../vim61.028/src/version.c	Tue Apr 23 22:08:09 2002
---- src/version.c	Tue Apr 23 22:10:05 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     29,
-  /**/
-
--- 
-FATHER: One day, lad, all this will be yours ...
-PRINCE: What - the curtains?
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.030 b/app-editors/vim/files/6.1.030
deleted file mode 100644
index 69576ebfc404..000000000000
--- a/app-editors/vim/files/6.1.030
+++ /dev/null
@@ -1,91 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.030
-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.030
-Problem:    When CTRL-N is mapped in Insert mode, it is also mapped after
-	    CTRL-X CTRL-N, while it is not mapped after CTRL-X CTRL-F.
-	    (Kontra Gergely)
-Solution:   Don't map CTRL-N after CTRL-X CTRL-N.  Same for CTRL-P.
-Files:	    src/getchar.c
-
-
-*** ../vim61.029/src/getchar.c	Sat Mar 16 13:45:17 2002
---- src/getchar.c	Wed Apr  3 20:26:44 2002
-***************
-*** 1752,1775 ****
-  		     */
-  		    mp = NULL;
-  		    max_mlen = 0;
-  		    if (no_mapping == 0 && maphash_valid
-  			    && (typebuf.tb_maplen == 0
-  				|| (p_remap
-  				    && typebuf.tb_noremap[typebuf.tb_off]
-  								  != RM_NONE))
-  			    && !(p_paste && (State & (INSERT + CMDLINE)))
-! 			    && !(State == HITRETURN
-! 				&& (typebuf.tb_buf[typebuf.tb_off] == CR
-! 				    || typebuf.tb_buf[typebuf.tb_off] == ' '))
-  			    && State != ASKMORE
-  			    && State != CONFIRM
-  #ifdef FEAT_INS_EXPAND
-! 			    && !(ctrl_x_mode && vim_is_ctrl_x_key(
-! 					      typebuf.tb_buf[typebuf.tb_off]))
-  #endif
-  			    )
-  		    {
-- 			c1 = typebuf.tb_buf[typebuf.tb_off];
-  #ifdef FEAT_LANGMAP
-  			if (c1 == K_SPECIAL)
-  			    nolmaplen = 2;
---- 1752,1774 ----
-  		     */
-  		    mp = NULL;
-  		    max_mlen = 0;
-+ 		    c1 = typebuf.tb_buf[typebuf.tb_off];
-  		    if (no_mapping == 0 && maphash_valid
-  			    && (typebuf.tb_maplen == 0
-  				|| (p_remap
-  				    && typebuf.tb_noremap[typebuf.tb_off]
-  								  != RM_NONE))
-  			    && !(p_paste && (State & (INSERT + CMDLINE)))
-! 			    && !(State == HITRETURN && (c1 == CR || c1 == ' '))
-  			    && State != ASKMORE
-  			    && State != CONFIRM
-  #ifdef FEAT_INS_EXPAND
-! 			    && !((ctrl_x_mode != 0 && vim_is_ctrl_x_key(c1))
-! 				    || ((continue_status & CONT_LOCAL)
-! 					&& (c1 == Ctrl_N || c1 == Ctrl_P)))
-  #endif
-  			    )
-  		    {
-  #ifdef FEAT_LANGMAP
-  			if (c1 == K_SPECIAL)
-  			    nolmaplen = 2;
-*** ../vim61.029/src/version.c	Tue Apr 23 22:11:59 2002
---- src/version.c	Tue Apr 23 22:19:52 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     30,
-  /**/
-
--- 
-FATHER:       Make sure the Prince doesn't leave this room until I come and
-              get him.
-FIRST GUARD:  Not ... to leave the room ... even if you come and get him.
-FATHER:       No.  Until I come and get him.
-SECOND GUARD: Hic.
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.031 b/app-editors/vim/files/6.1.031
deleted file mode 100644
index da91a614eae6..000000000000
--- a/app-editors/vim/files/6.1.031
+++ /dev/null
@@ -1,64 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.031
-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.031
-Problem:    Cygwin: Xxd could read a file in text mode intead of binary mode.
-Solution:   Use "rb" or "rt" when needed. (Pavol Juhas)
-Files:	    src/xxd/xxd.c
-
-
-*** ../vim61.030/src/xxd/xxd.c	Mon Jul 16 10:11:02 2001
---- src/xxd/xxd.c	Thu Apr 11 19:53:34 2002
-***************
-*** 134,145 ****
-  # endif
-  #endif
-  
-! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(CYGWIN) || defined(CYGWIN32)
-  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
-  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
-  # define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT)
-  # define BIN_ASSIGN(fp, yes) setmode(fileno(fp), (yes) ? O_BINARY : O_TEXT)
-! # if defined(CYGWIN) || defined(CYGWIN32)
-  #  define PATH_SEP '/'
-  # else
-  #  define PATH_SEP '\\'
---- 134,148 ----
-  # endif
-  #endif
-  
-! #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
-! # define CYGWIN
-! #endif
-! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(CYGWIN)
-  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
-  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
-  # define BIN_CREAT(yes) ((yes) ? (O_CREAT|O_BINARY) : O_CREAT)
-  # define BIN_ASSIGN(fp, yes) setmode(fileno(fp), (yes) ? O_BINARY : O_TEXT)
-! # if defined(CYGWIN)
-  #  define PATH_SEP '/'
-  # else
-  #  define PATH_SEP '\\'
-*** ../vim61.030/src/version.c	Tue Apr 23 22:22:00 2002
---- src/version.c	Tue Apr 23 22:24:47 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     31,
-  /**/
-
--- 
-I'd like to meet the man who invented sex and see what he's working on now.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.032 b/app-editors/vim/files/6.1.032
deleted file mode 100644
index 0afcdb9c4fb5..000000000000
--- a/app-editors/vim/files/6.1.032
+++ /dev/null
@@ -1,124 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.032
-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.032
-Problem:    Can't specify a quickfix file without jumping to the first error.
-Solution:   Add the ":cgetfile" command. (Yegappan Lakshmanan)
-Files:	    runtime/doc/index.txt, runtime/doc/quickfix.txt, src/ex_cmds.h,
-	    src/quickfix.c
-
-*** ../vim61.031/runtime/doc/index.txt	Fri Mar 22 21:18:37 2002
---- runtime/doc/index.txt	Tue Apr 23 22:35:42 2002
-***************
-*** 1,4 ****
-! *index.txt*     For Vim version 6.1.  Last change: 2002 Mar 09
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
---- 1,4 ----
-! *index.txt*     For Vim version 6.1.  Last change: 2002 Apr 23
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
-***************
-*** 1036,1043 ****
-  |:cclose|	:ccl[ose]	close quickfix window
-  |:cd|		:cd		change directory
-  |:center|	:ce[nter]	format lines at the center
-! |:cfile|	:cf[ile]	read the file with error messages
-  |:cfirst|	:cfir[st]	go to the specified error, default first one
-  |:chdir|	:chd[ir]	change directory
-  |:checkpath|	:che[ckpath]	list included files
-  |:checktime|	:checkt[ime]	check timestamp of loaded buffers
---- 1036,1044 ----
-  |:cclose|	:ccl[ose]	close quickfix window
-  |:cd|		:cd		change directory
-  |:center|	:ce[nter]	format lines at the center
-! |:cfile|	:cf[ile]	read file with error messages and jump to first
-  |:cfirst|	:cfir[st]	go to the specified error, default first one
-+ |:cgetfile|	:cg[etfile]	read file with error messages
-  |:chdir|	:chd[ir]	change directory
-  |:checkpath|	:che[ckpath]	list included files
-  |:checktime|	:checkt[ime]	check timestamp of loaded buffers
-*** ../vim61.031/runtime/doc/quickfix.txt	Fri Mar 22 21:18:38 2002
---- runtime/doc/quickfix.txt	Tue Apr 23 22:34:17 2002
-***************
-*** 1,4 ****
-! *quickfix.txt*  For Vim version 6.1.  Last change: 2001 Sep 21
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
---- 1,4 ----
-! *quickfix.txt*  For Vim version 6.1.  Last change: 2002 Apr 23
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
-***************
-*** 101,106 ****
---- 101,111 ----
-  			keep Vim running while compiling.  If you give the
-  			name of the errorfile, the 'errorfile' option will
-  			be set to [errorfile].  See |:cc| for [!].
-+ 
-+ 							*:cg* *:cgetfile*
-+ :cg[etfile][!] [errorfile]
-+ 			Read the error file.  Just like ":cfile" but don't
-+ 			jump to the first error.
-  
-  							*:cl* *:clist*
-  :cl[ist] [from] [, [to]]
-*** ../vim61.031/src/ex_cmds.h	Sat Dec 15 18:24:11 2001
---- src/ex_cmds.h	Tue Apr 23 22:32:18 2002
-***************
-*** 198,203 ****
---- 198,205 ----
-  			TRLBAR|FILE1|BANG),
-  EX(CMD_cfirst,		"cfirst",	ex_cc,
-  			RANGE|NOTADR|COUNT|TRLBAR|BANG),
-+ EX(CMD_cgetfile,	"cgetfile",	ex_cfile,
-+ 			TRLBAR|FILE1|BANG),
-  EX(CMD_chdir,		"chdir",	ex_cd,
-  			FILE1|TRLBAR|CMDWIN),
-  EX(CMD_checkpath,	"checkpath",	ex_checkpath,
-*** ../vim61.031/src/quickfix.c	Mon Nov  5 21:34:43 2001
---- src/quickfix.c	Tue Apr 23 22:31:07 2002
-***************
-*** 2020,2026 ****
-  {
-      if (*eap->arg != NUL)
-  	set_string_option_direct((char_u *)"ef", -1, eap->arg, OPT_FREE);
-!     if (qf_init(p_ef, p_efm, TRUE) > 0)
-  	qf_jump(0, 0, eap->forceit);		/* display first error */
-  }
-  
---- 2020,2026 ----
-  {
-      if (*eap->arg != NUL)
-  	set_string_option_direct((char_u *)"ef", -1, eap->arg, OPT_FREE);
-!     if (qf_init(p_ef, p_efm, TRUE) > 0 && eap->cmdidx == CMD_cfile)
-  	qf_jump(0, 0, eap->forceit);		/* display first error */
-  }
-  
-*** ../vim61.031/src/version.c	Tue Apr 23 22:25:55 2002
---- src/version.c	Tue Apr 23 22:37:11 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     32,
-  /**/
-
--- 
-Just think of all the things we haven't thought of yet.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.033 b/app-editors/vim/files/6.1.033
deleted file mode 100644
index 7e81bcc50746..000000000000
--- a/app-editors/vim/files/6.1.033
+++ /dev/null
@@ -1,50 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.033
-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.033
-Problem:    GUI: When the selection is lost and the Visual highlighting is
-	    changed to underlining, the cursor is left in a different
-	    position. (Christian Michon)
-Solution:   Update the cursor position after redrawing the selection.
-Files:	    src/ui.c
-
-
-*** ../vim61.032/src/ui.c	Sun Apr 21 16:49:39 2002
---- src/ui.c	Sun Apr 28 21:41:19 2002
-***************
-*** 482,487 ****
---- 482,491 ----
-  	    setcursor();
-  	    cursor_on();
-  	    out_flush();
-+ # ifdef FEAT_GUI
-+ 	    if (gui.in_use)
-+ 		gui_update_cursor(TRUE, FALSE);
-+ # endif
-  	}
-      }
-  #endif
-*** ../vim61.032/src/version.c	Tue Apr 23 22:43:00 2002
---- src/version.c	Sun Apr 28 21:58:51 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     33,
-  /**/
-
--- 
-Q: How does a UNIX Guru pick up a girl?
-A: look; grep; which; eval; nice; uname; talk; date;
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.034 b/app-editors/vim/files/6.1.034
deleted file mode 100644
index e6fbcec6b505..000000000000
--- a/app-editors/vim/files/6.1.034
+++ /dev/null
@@ -1,64 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.034
-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.034
-Problem:    A CVS diff file isn't recognized as diff filetype.
-Solution:   Skip lines starting with "? " before checking for an "Index:" line.
-Files:	    runtime/scripts.vim
-
-
-*** ../vim61.033/runtime/scripts.vim	Tue Apr 23 21:22:42 2002
---- runtime/scripts.vim	Sun Apr 14 13:30:29 2002
-***************
-*** 254,259 ****
---- 254,274 ----
-    elseif s:line1 =~ '|\*\{1,80}' && s:line2 =~ 'VRC '
-  	\ || s:line2 =~ '|\*\{1,80}' && s:line3 =~ 'VRC '
-      set ft=baan
-+ 
-+   " Valgrind
-+   elseif s:line1 =~ '^==\d\+== valgrind'
-+     set ft=valgrind
-+ 
-+   " CVS diff
-+   else
-+     let lnum = 1
-+     while getline(lnum) =~ "^? " && lnum < line("$")
-+       let lnum = lnum + 1
-+     endwhile
-+     if getline(lnum) =~ '^Index:\s\+\f\+$'
-+       set ft=diff
-+     endif
-+ 
-    endif
-  
-    unlet s:line2 s:line3 s:line4 s:line5
-*** ../vim61.033/src/version.c	Sun Apr 28 22:00:14 2002
---- src/version.c	Sun Apr 28 22:02:39 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     34,
-  /**/
-
--- 
-ARTHUR:  Be quiet!
-DENNIS:  Well you can't expect to wield supreme executive power just 'cause
-         some watery tart threw a sword at you!
-ARTHUR:  Shut up!
-DENNIS:  I mean, if I went around sayin' I was an empereror just because some
-         moistened bint had lobbed a scimitar at me they'd put me away!
-                                  The Quest for the Holy Grail (Monty Python)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.036 b/app-editors/vim/files/6.1.036
deleted file mode 100644
index caa16c28438b..000000000000
--- a/app-editors/vim/files/6.1.036
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.036
-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.036
-Problem:    This command may cause a crash: ":v/./,//-j". (Ralf Arens)
-Solution:   Compute the right length of the regexp when it's empty.
-Files:	    src/search.c
-
-
-*** ../vim61.035/src/search.c	Mon Apr  8 22:11:31 2002
---- src/search.c	Tue Apr 23 19:51:26 2002
-***************
-*** 989,995 ****
-  	    }
-  
-  	    /* compute length of search command for get_address() */
-! 	    searchcmdlen += (int)(p - searchstr);
-  
-  	    str = p;			    /* put str after search command */
-  	}
---- 989,995 ----
-  	    }
-  
-  	    /* compute length of search command for get_address() */
-! 	    searchcmdlen += (int)(p - str);
-  
-  	    str = p;			    /* put str after search command */
-  	}
-*** ../vim61.035/src/version.c	Sun Apr 28 22:08:02 2002
---- src/version.c	Sun Apr 28 22:09:54 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     36,
-  /**/
-
--- 
-ARTHUR:  Shut up!  Will you shut up!
-DENNIS:  Ah, now we see the violence inherent in the system.
-ARTHUR:  Shut up!
-DENNIS:  Oh!  Come and see the violence inherent in the system!
-         HELP! HELP!  I'm being repressed!
-                                  The Quest for the Holy Grail (Monty Python)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.037 b/app-editors/vim/files/6.1.037
deleted file mode 100644
index 4efcc2b32219..000000000000
--- a/app-editors/vim/files/6.1.037
+++ /dev/null
@@ -1,86 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.037
-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.037
-Problem:    When 'lazyredraw' is set, pressing "q" at the hit-enter prompt
-	    causes an incomplete redraw and the cursor isn't positioned.
-	    (Lubomir Host)
-Solution:   Overrule 'lazyredraw' when do_redraw is set.
-Files:	    src/main.c, src/screen.c
-
-
-*** ../vim61.036/src/main.c	Tue Apr 23 22:08:09 2002
---- src/main.c	Tue Apr 23 22:37:52 2002
-***************
-*** 1983,1993 ****
-  	    emsg_on_display = FALSE;	/* can delete error message now */
-  	    did_emsg = FALSE;
-  	    msg_didany = FALSE;		/* reset lines_left in msg_start() */
-- 	    do_redraw = FALSE;
-  	    showruler(FALSE);
-  
-  	    setcursor();
-  	    cursor_on();
-  	}
-  #ifdef FEAT_GUI
-  	if (need_mouse_correct)
---- 1983,1994 ----
-  	    emsg_on_display = FALSE;	/* can delete error message now */
-  	    did_emsg = FALSE;
-  	    msg_didany = FALSE;		/* reset lines_left in msg_start() */
-  	    showruler(FALSE);
-  
-  	    setcursor();
-  	    cursor_on();
-+ 
-+ 	    do_redraw = FALSE;
-  	}
-  #ifdef FEAT_GUI
-  	if (need_mouse_correct)
-*** ../vim61.036/src/screen.c	Tue Apr 23 21:59:06 2002
---- src/screen.c	Tue Apr 23 20:24:48 2002
-***************
-*** 7711,7717 ****
-      int
-  redrawing()
-  {
-!     return (!RedrawingDisabled && !(p_lz && char_avail() && !KeyTyped));
-  }
-  
-  /*
---- 7711,7718 ----
-      int
-  redrawing()
-  {
-!     return (!RedrawingDisabled
-! 		       && !(p_lz && char_avail() && !KeyTyped && !do_redraw));
-  }
-  
-  /*
-*** ../vim61.036/src/version.c	Sun Apr 28 22:11:57 2002
---- src/version.c	Sun Apr 28 22:13:25 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     37,
-  /**/
-
--- 
-ARTHUR:  Bloody peasant!
-DENNIS:  Oh, what a give away.  Did you here that, did you here that, eh?
-         That's what I'm on about -- did you see him repressing me, you saw it
-         didn't you?
-                                  The Quest for the Holy Grail (Monty Python)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.038 b/app-editors/vim/files/6.1.038
deleted file mode 100644
index 521e981755ce..000000000000
--- a/app-editors/vim/files/6.1.038
+++ /dev/null
@@ -1,68 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.038
-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.038
-Problem:    Multi-byte: When a ":s" command contains a multi-byte character
-	    where the trail byte is '~' the text is messed up.
-Solution:   Properly skip multi-byte characters in regtilde() (Muraoka Taro)
-Files:	    src/regexp.c
-
-
-*** ../vim61.037/src/regexp.c	Mon Apr  8 22:11:31 2002
---- src/regexp.c	Thu Apr 25 21:23:49 2002
-***************
-*** 5351,5358 ****
-  		STRCPY(p, p + 2);		/* remove '\~' */
-  	    --p;
-  	}
-! 	else if (*p == '\\' && p[1])		/* skip escaped characters */
-! 	    ++p;
-      }
-  
-      vim_free(reg_prev_sub);
---- 5353,5367 ----
-  		STRCPY(p, p + 2);		/* remove '\~' */
-  	    --p;
-  	}
-! 	else
-! 	{
-! 	    if (*p == '\\' && p[1])		/* skip escaped characters */
-! 		++p;
-! #ifdef FEAT_MBYTE
-! 	    if (has_mbyte)
-! 		p += (*mb_ptr2len_check)(p) - 1;
-! #endif
-! 	}
-      }
-  
-      vim_free(reg_prev_sub);
-*** ../vim61.037/src/version.c	Sun Apr 28 22:17:31 2002
---- src/version.c	Sun Apr 28 22:19:04 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     38,
-  /**/
-
--- 
-ARTHUR:  You fight with the strength of many men, Sir knight.
-         I am Arthur, King of the Britons.  [pause]
-         I seek the finest and the bravest knights in the land to join me
-         in my Court of Camelot.  [pause]
-         You have proved yourself worthy; will you join me?  [pause]
-         You make me sad.  So be it.  Come, Patsy.
-BLACK KNIGHT:  None shall pass.
-                                  The Quest for the Holy Grail (Monty Python)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.039 b/app-editors/vim/files/6.1.039
deleted file mode 100644
index 86a9fff8b83c..000000000000
--- a/app-editors/vim/files/6.1.039
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.039
-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.039
-Problem:    When folds are defined and the file is changed outside of Vim,
-	    reloading the file doesn't update the folds. (Anders
-	    Schack-Nielsen)
-Solution:   Recompute the folds after reloading the file.
-Files:	    src/fileio.c
-
-
-*** ../vim61.038/src/fileio.c	Tue Apr 23 22:11:59 2002
---- src/fileio.c	Tue Apr 23 20:49:02 2002
-***************
-*** 5270,5275 ****
---- 5270,5286 ----
-  #ifdef FEAT_AUTOCMD
-  	    keep_filetype = FALSE;
-  #endif
-+ #ifdef FEAT_FOLDING
-+ 	    {
-+ 		win_T *wp;
-+ 
-+ 		/* Update folds unless they are defined manually. */
-+ 		FOR_ALL_WINDOWS(wp)
-+ 		    if (wp->w_buffer == curwin->w_buffer
-+ 			    && !foldmethodIsManual(wp))
-+ 			foldUpdateAll(wp);
-+ 	    }
-+ #endif
-  	    /* If the mode didn't change and 'readonly' was set, keep the old
-  	     * value; the user probably used the ":view" command.  But don't
-  	     * reset it, might have had a read error. */
-*** ../vim61.038/src/version.c	Sun Apr 28 22:20:43 2002
---- src/version.c	Mon Apr 29 21:52:19 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     39,
-  /**/
-
--- 
-There can't be a crisis today, my schedule is already full. 
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.040 b/app-editors/vim/files/6.1.040
deleted file mode 100644
index b53dfda304a5..000000000000
--- a/app-editors/vim/files/6.1.040
+++ /dev/null
@@ -1,221 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.040
-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.040
-Problem:    When changing directory for expanding a file name fails there is
-	    no error message.
-Solution:   Give an error message for this situation.  Don't change directory
-	    if we can't return to the original directory.
-Files:	    src/diff.c, src/ex_docmd.c, src/globals.h, src/misc1.c,
-	    src/os_unix.c
-
-
-*** ../vim61.039/src/diff.c	Tue Mar 19 19:38:47 2002
---- src/diff.c	Sun Apr 28 18:32:57 2002
-***************
-*** 780,787 ****
-      /* Temporaraly chdir to /tmp, to avoid patching files in the current
-       * directory when the patch file contains more than one patch.  When we
-       * have our own temp dir use that instead, it will be cleaned up when we
-!      * exit (any .rej files created). */
-!     if (mch_dirname(dirbuf, MAXPATHL) != OK)
-  	dirbuf[0] = NUL;
-      else
-      {
---- 780,788 ----
-      /* Temporaraly chdir to /tmp, to avoid patching files in the current
-       * directory when the patch file contains more than one patch.  When we
-       * have our own temp dir use that instead, it will be cleaned up when we
-!      * exit (any .rej files created).  Don't change directory if we can't
-!      * return to the current. */
-!     if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir(dirbuf) != 0)
-  	dirbuf[0] = NUL;
-      else
-      {
-***************
-*** 819,825 ****
-  #ifdef UNIX
-      if (dirbuf[0] != NUL)
-      {
-! 	mch_chdir((char *)dirbuf);
-  	shorten_fnames(TRUE);
-      }
-  #endif
---- 820,827 ----
-  #ifdef UNIX
-      if (dirbuf[0] != NUL)
-      {
-! 	if (mch_chdir((char *)dirbuf) != 0)
-! 	    EMSG(_(e_prev_dir));
-  	shorten_fnames(TRUE);
-      }
-  #endif
-*** ../vim61.039/src/ex_docmd.c	Tue Apr  9 23:19:52 2002
---- src/ex_docmd.c	Sun Apr 28 18:33:41 2002
-***************
-*** 6689,6695 ****
-  		/*
-  		 * Change to session file's dir.
-  		 */
-! 		if (mch_dirname(dirnow, MAXPATHL) == FAIL)
-  		    *dirnow = NUL;
-  		if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR))
-  		{
---- 6689,6696 ----
-  		/*
-  		 * Change to session file's dir.
-  		 */
-! 		if (mch_dirname(dirnow, MAXPATHL) == FAIL
-! 						    || mch_chdir(dirnow) != 0)
-  		    *dirnow = NUL;
-  		if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR))
-  		{
-***************
-*** 6709,6715 ****
-  		if (*dirnow != NUL && ((ssop_flags & SSOP_SESDIR)
-  			|| ((ssop_flags & SSOP_CURDIR) && globaldir != NULL)))
-  		{
-! 		    (void)mch_chdir((char *)dirnow);
-  		    shorten_fnames(TRUE);
-  		}
-  	    }
---- 6710,6717 ----
-  		if (*dirnow != NUL && ((ssop_flags & SSOP_SESDIR)
-  			|| ((ssop_flags & SSOP_CURDIR) && globaldir != NULL)))
-  		{
-! 		    if (mch_chdir((char *)dirnow) != 0)
-! 			EMSG(_(e_prev_dir));
-  		    shorten_fnames(TRUE);
-  		}
-  	    }
-*** ../vim61.039/src/globals.h	Tue Apr  9 23:19:52 2002
---- src/globals.h	Tue Apr 23 21:40:11 2002
-***************
-*** 1122,1127 ****
---- 1122,1131 ----
-  #endif
-  EXTERN char_u e_patnotf2[]	INIT(=N_("Pattern not found: %s"));
-  EXTERN char_u e_positive[]	INIT(=N_("Argument must be positive"));
-+ #if defined(UNIX) || defined(FEAT_SESSION)
-+ EXTERN char_u e_prev_dir[]	INIT(=N_("E459: Cannot go back to previous directory"));
-+ #endif
-+ 
-  #ifdef FEAT_QUICKFIX
-  EXTERN char_u e_quickfix[]	INIT(=N_("E42: No Errors"));
-  #endif
-*** ../vim61.039/src/misc1.c	Tue Apr  9 20:17:54 2002
---- src/misc1.c	Sun Apr 28 18:34:14 2002
-***************
-*** 2823,2835 ****
-  #ifdef UNIX
-  	/*
-  	 * Change to the directory and get the actual path.  This resolves
-! 	 * links.
-  	 */
-! 	if (mch_dirname(NameBuff, MAXPATHL) == OK)
-  	{
-  	    if (!mch_chdir((char *)var) && mch_dirname(IObuff, IOSIZE) == OK)
-  		var = IObuff;
-! 	    mch_chdir((char *)NameBuff);
-  	}
-  #endif
-  	homedir = vim_strsave(var);
---- 2823,2836 ----
-  #ifdef UNIX
-  	/*
-  	 * Change to the directory and get the actual path.  This resolves
-! 	 * links.  Don't do it when we can't return.
-  	 */
-! 	if (mch_dirname(NameBuff, MAXPATHL) == OK && mch_chdir(NameBuff) == 0)
-  	{
-  	    if (!mch_chdir((char *)var) && mch_dirname(IObuff, IOSIZE) == OK)
-  		var = IObuff;
-! 	    if (mch_chdir((char *)NameBuff) != 0)
-! 		EMSG(_(e_prev_dir));
-  	}
-  #endif
-  	homedir = vim_strsave(var);
-*** ../vim61.039/src/os_unix.c	Thu Mar 14 22:05:16 2002
---- src/os_unix.c	Sun Apr 28 18:37:14 2002
-***************
-*** 1991,2001 ****
-  		}
-  	    }
-  #endif
-  	    if (
-  #ifdef HAVE_FCHDIR
-  		fd < 0 &&
-  #endif
-! 			    mch_dirname(olddir, MAXPATHL) == FAIL)
-  	    {
-  		p = NULL;	/* can't get current dir: don't chdir */
-  		retval = FAIL;
---- 1991,2005 ----
-  		}
-  	    }
-  #endif
-+ 
-+ 	    /* Only change directory when we are sure we can return to where
-+ 	     * we are now.  After doing "su" chdir(".") might not work. */
-  	    if (
-  #ifdef HAVE_FCHDIR
-  		fd < 0 &&
-  #endif
-! 			(mch_dirname(olddir, MAXPATHL) == FAIL
-! 						   || mch_chdir(olddir) != 0))
-  	    {
-  		p = NULL;	/* can't get current dir: don't chdir */
-  		retval = FAIL;
-***************
-*** 2046,2057 ****
-  #ifdef HAVE_FCHDIR
-  	    if (fd >= 0)
-  	    {
-! 		fchdir(fd);
-  		close(fd);
-  	    }
-  	    else
-  #endif
-! 		mch_chdir((char *)olddir);
-  	}
-  
-  	l = STRLEN(buf);
---- 2050,2063 ----
-  #ifdef HAVE_FCHDIR
-  	    if (fd >= 0)
-  	    {
-! 		l = fchdir(fd);
-  		close(fd);
-  	    }
-  	    else
-  #endif
-! 		l = mch_chdir((char *)olddir);
-! 	    if (l != 0)
-! 		EMSG(_(e_prev_dir));
-  	}
-  
-  	l = STRLEN(buf);
-*** ../vim61.039/src/version.c	Mon Apr 29 21:53:23 2002
---- src/version.c	Mon Apr 29 21:55:38 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     40,
-  /**/
-
--- 
-Did you ever stop to think...  and forget to start again? 
-                                  -- Steven Wright
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.041 b/app-editors/vim/files/6.1.041
deleted file mode 100644
index e42ed1b3d70c..000000000000
--- a/app-editors/vim/files/6.1.041
+++ /dev/null
@@ -1,144 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.041
-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.041
-Problem:    ":mkvimrc" doesn't handle a mapping that has a leading space in
-	    the rhs. (Davyd Ondrejko)
-Solution:   Insert a CTRL-V before the leading space.  Also display leading
-	    and trailing white space in <> form.
-Files:	    src/getchar.c, src/message.c
-
-
-*** ../vim61.040/src/getchar.c	Tue Apr 23 22:22:00 2002
---- src/getchar.c	Mon Apr 29 22:53:52 2002
-***************
-*** 4051,4061 ****
-   * return FAIL for failure, OK otherwise
-   */
-      int
-! put_escstr(fd, str, what)
-      FILE	*fd;
-!     char_u	*str;
-      int		what;
-  {
-      int		c;
-      int		modifiers;
-  
---- 4051,4062 ----
-   * return FAIL for failure, OK otherwise
-   */
-      int
-! put_escstr(fd, strstart, what)
-      FILE	*fd;
-!     char_u	*strstart;
-      int		what;
-  {
-+     char_u	*str = strstart;
-      int		c;
-      int		modifiers;
-  
-***************
-*** 4136,4141 ****
---- 4137,4144 ----
-  	 * prevent them from misinterpreted in DoOneCmd().
-  	 * A space, Tab and '"' has to be escaped with a backslash to
-  	 * prevent it to be misinterpreted in do_set().
-+ 	 * A space has to be escaped with a CTRL-V when it's at the start of a
-+ 	 * ":map" rhs.
-  	 * A '<' has to be escaped with a CTRL-V to prevent it being
-  	 * interpreted as the start of a special key name.
-  	 * A space in the lhs of a :map needs a CTRL-V.
-***************
-*** 4145,4152 ****
-  	    if (putc('\\', fd) < 0)
-  		return FAIL;
-  	}
-! 	else if (c < ' ' || c > '~' || c == '|' || (what != 2 && c == '<')
-! 						   || (what == 0 && c == ' '))
-  	{
-  	    if (putc(Ctrl_V, fd) < 0)
-  		return FAIL;
---- 4148,4157 ----
-  	    if (putc('\\', fd) < 0)
-  		return FAIL;
-  	}
-! 	else if (c < ' ' || c > '~' || c == '|'
-! 		|| (what == 0 && c == ' ')
-! 		|| (what == 1 && str == strstart && c == ' ')
-! 		|| (what != 2 && c == '<'))
-  	{
-  	    if (putc(Ctrl_V, fd) < 0)
-  		return FAIL;
-*** ../vim61.040/src/message.c	Fri Mar 15 21:36:35 2002
---- src/message.c	Mon Apr 29 22:56:26 2002
-***************
-*** 1162,1171 ****
-   * the character/string -- webb
-   */
-      int
-! msg_outtrans_special(str, from)
-!     char_u	*str;
-      int		from;	/* TRUE for lhs of a mapping */
-  {
-      int		retval = 0;
-      char_u	*string;
-      int		attr;
---- 1162,1172 ----
-   * the character/string -- webb
-   */
-      int
-! msg_outtrans_special(strstart, from)
-!     char_u	*strstart;
-      int		from;	/* TRUE for lhs of a mapping */
-  {
-+     char_u	*str = strstart;
-      int		retval = 0;
-      char_u	*string;
-      int		attr;
-***************
-*** 1174,1180 ****
-      attr = hl_attr(HLF_8);
-      while (*str != NUL)
-      {
-! 	string = str2special(&str, from);
-  	len = vim_strsize(string);
-  	/* Highlight special keys */
-  	msg_puts_attr(string, len > 1
---- 1175,1188 ----
-      attr = hl_attr(HLF_8);
-      while (*str != NUL)
-      {
-! 	/* Leading and trailing spaces need to be displayed in <> form. */
-! 	if ((str == strstart || str[1] == NUL) && *str == ' ')
-! 	{
-! 	    string = (char_u *)"<Space>";
-! 	    ++str;
-! 	}
-! 	else
-! 	    string = str2special(&str, from);
-  	len = vim_strsize(string);
-  	/* Highlight special keys */
-  	msg_puts_attr(string, len > 1
-*** ../vim61.040/src/version.c	Mon Apr 29 21:59:52 2002
---- src/version.c	Mon Apr 29 22:50:28 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     41,
-  /**/
-
--- 
-It's not hard to meet expenses, they're everywhere. 
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.042 b/app-editors/vim/files/6.1.042
deleted file mode 100644
index fed5266b4de8..000000000000
--- a/app-editors/vim/files/6.1.042
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.042
-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.042
-Problem:    "vim -r" doesn't show all matches when 'wildignore' removes swap
-	    files. (Steve Talley)
-Solution:   Keep all matching swap file names.
-Files:	    src/memline.c
-
-
-*** ../vim61.041/src/memline.c	Sun Feb 17 13:45:43 2002
---- src/memline.c	Tue Apr 30 16:41:41 2002
-***************
-*** 1318,1324 ****
-  	if (num_names == 0)
-  	    num_files = 0;
-  	else if (expand_wildcards(num_names, names, &num_files, &files,
-! 						   EW_FILE|EW_SILENT) == FAIL)
-  	    num_files = 0;
-  
-  	/*
---- 1318,1324 ----
-  	if (num_names == 0)
-  	    num_files = 0;
-  	else if (expand_wildcards(num_names, names, &num_files, &files,
-! 					EW_KEEPALL|EW_FILE|EW_SILENT) == FAIL)
-  	    num_files = 0;
-  
-  	/*
-*** ../vim61.041/src/version.c	Mon Apr 29 22:57:48 2002
---- src/version.c	Tue Apr 30 16:45:23 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     42,
-  /**/
-
--- 
-ARTHUR:   Ni!
-BEDEVERE: Nu!
-ARTHUR:   No.  Ni!  More like this. "Ni"!
-BEDEVERE: Ni, ni, ni!
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.045 b/app-editors/vim/files/6.1.045
deleted file mode 100644
index bb4c617339e3..000000000000
--- a/app-editors/vim/files/6.1.045
+++ /dev/null
@@ -1,74 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.045
-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.045
-Problem:    In Visual mode, with lots of folds and 'scrolloff' set to 999,
-	    moving the cursor down near the end of the file causes the text to
-	    jump up and down. (Lubomir Host)
-Solution:   Take into account that the cursor may be on the last line of a
-	    closed fold.
-Files:	    src/move.c
-
-
-*** ../vim61.044/src/move.c	Sat Mar 16 16:41:26 2002
---- src/move.c	Thu May  2 19:50:31 2002
-***************
-*** 2078,2092 ****
-      lineoff_T	boff;
-  
-      loff.lnum = boff.lnum = curwin->w_cursor.lnum;
-  #ifdef FEAT_DIFF
-      used = plines_nofill(loff.lnum);
-      loff.fill = 0;
-      boff.fill = 0;
-  #else
-      used = plines(loff.lnum);
-- #endif
-- #ifdef FEAT_FOLDING
--     (void)hasFolding(boff.lnum, NULL, &boff.lnum);
-  #endif
-      topline = loff.lnum;
-      while (topline > 1)
---- 2078,2092 ----
-      lineoff_T	boff;
-  
-      loff.lnum = boff.lnum = curwin->w_cursor.lnum;
-+ #ifdef FEAT_FOLDING
-+     (void)hasFolding(loff.lnum, &loff.lnum, &boff.lnum);
-+ #endif
-  #ifdef FEAT_DIFF
-      used = plines_nofill(loff.lnum);
-      loff.fill = 0;
-      boff.fill = 0;
-  #else
-      used = plines(loff.lnum);
-  #endif
-      topline = loff.lnum;
-      while (topline > 1)
-*** ../vim61.044/src/version.c	Wed May  1 21:20:47 2002
---- src/version.c	Thu May  2 19:48:29 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     45,
-  /**/
-
--- 
-ARTHUR:          But if he was dying, he wouldn't bother to carve
-                 "Aaaaarrrrrrggghhh".  He'd just say it.
-BROTHER MAYNARD: It's down there carved in stone.
-GALAHAD:         Perhaps he was dictating.
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.046 b/app-editors/vim/files/6.1.046
deleted file mode 100644
index b8a44f906ad5..000000000000
--- a/app-editors/vim/files/6.1.046
+++ /dev/null
@@ -1,77 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.046
-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.046
-Problem:    X11 GUI: ":set lsp=2 gcr=n-v-i:hor1-blinkon0" draws a black
-	    rectangle.  ":set lsp=2 gcr=n-v-i:hor10-blinkon0" makes the cursor
-	    disappear.  (Nam SungHyun)
-Solution:   Correctly compute the height of the horizontal cursor.
-Files:	    src/gui_gtk_x11.c, src/gui_x11.c
-
-
-*** ../vim61.045/src/gui_gtk_x11.c	Wed Mar 13 21:19:58 2002
---- src/gui_gtk_x11.c	Fri May  3 20:43:39 2002
-***************
-*** 3245,3252 ****
-  	    !(State & CMDLINE) && curwin->w_p_rl ? FILL_X(gui.col + 1) - w :
-  #endif
-  	    FILL_X(gui.col),
-! 	    FILL_Y(gui.row) + gui.char_height - h + (int)p_linespace / 2,
-! 	    w, h - (int)p_linespace);
-  }
-  
-  
---- 3245,3252 ----
-  	    !(State & CMDLINE) && curwin->w_p_rl ? FILL_X(gui.col + 1) - w :
-  #endif
-  	    FILL_X(gui.col),
-! 	    FILL_Y(gui.row) + gui.char_height - h,
-! 	    w, h);
-  }
-  
-  
-*** ../vim61.045/src/gui_x11.c	Sun Mar 17 22:05:55 2002
---- src/gui_x11.c	Fri May  3 20:45:52 2002
-***************
-*** 2573,2580 ****
-  	    !(State & CMDLINE) && curwin->w_p_rl ? FILL_X(gui.col + 1) - w :
-  #endif
-  		FILL_X(gui.col),
-! 	    FILL_Y(gui.row) + gui.char_height - h + (int)p_linespace / 2,
-! 	    w, h - (int)p_linespace);
-  }
-  
-  /*
---- 2573,2580 ----
-  	    !(State & CMDLINE) && curwin->w_p_rl ? FILL_X(gui.col + 1) - w :
-  #endif
-  		FILL_X(gui.col),
-! 	    FILL_Y(gui.row) + gui.char_height - h,
-! 	    w, h);
-  }
-  
-  /*
-*** ../vim61.045/src/version.c	Thu May  2 19:52:55 2002
---- src/version.c	Fri May  3 20:49:39 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     46,
-  /**/
-
--- 
-Kisses may last for as much as, but no more than, five minutes.
-		[real standing law in Iowa, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.047 b/app-editors/vim/files/6.1.047
deleted file mode 100644
index 11c1f8a55d22..000000000000
--- a/app-editors/vim/files/6.1.047
+++ /dev/null
@@ -1,118 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.047
-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.047
-Problem:    When skipping commands after an error was encountered, expressions
-	    for ":if", ";elseif" and ":while" are still evaluated.
-Solution:   Skip the expression after an error. (Servatius Brandt)
-Files:	    src/ex_docmd.c
-
-
-*** ../vim61.046/src/ex_docmd.c	Wed May  1 19:40:35 2002
---- src/ex_docmd.c	Fri May  3 22:06:38 2002
-***************
-*** 7197,7202 ****
---- 7197,7205 ----
-  
-  #ifdef FEAT_EVAL
-  
-+ /*
-+  * ":if".
-+  */
-      static void
-  ex_if(eap)
-      exarg_T	*eap;
-***************
-*** 7214,7223 ****
-  	cstack->cs_flags[cstack->cs_idx] = 0;
-  
-  	/*
-! 	 * Don't do something when there is a surrounding conditional and it
-! 	 * was not active.
-  	 */
-! 	skip = (cstack->cs_idx > 0
-  		&& !(cstack->cs_flags[cstack->cs_idx - 1] & CSF_ACTIVE));
-  
-  	result = eval_to_bool(eap->arg, &error, &eap->nextcmd, skip);
---- 7217,7226 ----
-  	cstack->cs_flags[cstack->cs_idx] = 0;
-  
-  	/*
-! 	 * Don't do something after an error or when there is a surrounding
-! 	 * conditional and it was not active.
-  	 */
-! 	skip = did_emsg || (cstack->cs_idx > 0
-  		&& !(cstack->cs_flags[cstack->cs_idx - 1] & CSF_ACTIVE));
-  
-  	result = eval_to_bool(eap->arg, &error, &eap->nextcmd, skip);
-***************
-*** 7269,7278 ****
-      else
-      {
-  	/*
-! 	 * Don't do something when there is a surrounding conditional and it
-! 	 * was not active.
-  	 */
-! 	skip = (cstack->cs_idx > 0
-  		&& !(cstack->cs_flags[cstack->cs_idx - 1] & CSF_ACTIVE));
-  	if (!skip)
-  	{
---- 7272,7281 ----
-      else
-      {
-  	/*
-! 	 * Don't do something after an error or when there is a surrounding
-! 	 * conditional and it was not active.
-  	 */
-! 	skip = did_emsg || (cstack->cs_idx > 0
-  		&& !(cstack->cs_flags[cstack->cs_idx - 1] & CSF_ACTIVE));
-  	if (!skip)
-  	{
-***************
-*** 7332,7341 ****
-  	cstack->cs_flags[cstack->cs_idx] = CSF_WHILE;
-  
-  	/*
-! 	 * Don't do something when there is a surrounding conditional and it
-! 	 * was not active.
-  	 */
-! 	skip = (cstack->cs_idx > 0
-  		&& !(cstack->cs_flags[cstack->cs_idx - 1] & CSF_ACTIVE));
-  	result = eval_to_bool(eap->arg, &error, &eap->nextcmd, skip);
-  
---- 7335,7344 ----
-  	cstack->cs_flags[cstack->cs_idx] = CSF_WHILE;
-  
-  	/*
-! 	 * Don't do something after an error or when there is a surrounding
-! 	 * conditional and it was not active.
-  	 */
-! 	skip = did_emsg || (cstack->cs_idx > 0
-  		&& !(cstack->cs_flags[cstack->cs_idx - 1] & CSF_ACTIVE));
-  	result = eval_to_bool(eap->arg, &error, &eap->nextcmd, skip);
-  
-*** ../vim61.046/src/version.c	Fri May  3 22:02:55 2002
---- src/version.c	Fri May  3 22:08:52 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     47,
-  /**/
-
--- 
-Biting someone with your natural teeth is "simple assault," while biting
-someone with your false teeth is "aggravated assault."
-		[real standing law in Louisana, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.050 b/app-editors/vim/files/6.1.050
deleted file mode 100644
index 328242e9920a..000000000000
--- a/app-editors/vim/files/6.1.050
+++ /dev/null
@@ -1,49 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.050
-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.050 (depends on 6.1.049)
-Problem:    After patch 6.1.049 the non-GUI version doesn't compile.
-Solution:   Add an #ifdef FEAT_GUI.  (Robert Stanton)
-Files:	    src/syntax.c
-
-
-*** ../vim61.049/src/syntax.c	Sat May  4 22:25:13 2002
---- src/syntax.c	Sun May  5 12:01:50 2002
-***************
-*** 7851,7858 ****
---- 7851,7860 ----
-      vim_memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(struct hl_group));
-      HL_TABLE()[highlight_ga.ga_len].sg_name = name;
-      HL_TABLE()[highlight_ga.ga_len].sg_name_u = vim_strsave_up(name);
-+ #ifdef FEAT_GUI
-      HL_TABLE()[highlight_ga.ga_len].sg_gui_bg = INVALCOLOR;
-      HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR;
-+ #endif
-      ++highlight_ga.ga_len;
-      --highlight_ga.ga_room;
-  
-*** ../vim61.049/src/version.c	Sat May  4 22:25:13 2002
---- src/version.c	Sun May  5 12:09:23 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     50,
-  /**/
-
--- 
-A special cleaning ordinance bans housewives from hiding dirt and dust under a
-rug in a dwelling.
-		[real standing law in Pennsylvania, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.051 b/app-editors/vim/files/6.1.051
deleted file mode 100644
index 781b0c8ab45f..000000000000
--- a/app-editors/vim/files/6.1.051
+++ /dev/null
@@ -1,46 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.051
-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.051 (depends on 6.1.044)
-Problem:    Doesn't compile with GUI and small features.
-Solution:   Adjust the #if for ga_append().
-Files:	    src/misc2.c
-
-
-*** ../vim61.050/src/misc2.c	Tue Apr  9 23:19:52 2002
---- src/misc2.c	Sun May  5 13:28:18 2002
-***************
-*** 1593,1598 ****
---- 1593,1600 ----
-  #if defined(FEAT_EVAL) || defined(FEAT_CMDL_COMPL) || defined(FEAT_PYTHON) \
-  	|| defined(FEAT_RUBY) || defined(FEAT_TCL) || defined(FEAT_PERL) \
-  	|| defined(FEAT_CLIENTSERVER) \
-+ 	|| defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MOTIF) \
-+ 	|| defined(MSWIN_FIND_REPLACE) \
-  	|| (defined(FEAT_PRINTER) && defined(FEAT_POSTSCRIPT)) || defined(PROTO)
-  /*
-   * Append one byte to a growarray which contains bytes.
-*** ../vim61.050/src/version.c	Sun May  5 12:24:43 2002
---- src/version.c	Sun May  5 13:32:59 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     51,
-  /**/
-
--- 
-It is illegal to take more than three sips of beer at a time while standing.
-		[real standing law in Texas, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.052 b/app-editors/vim/files/6.1.052
deleted file mode 100644
index 1c88320771c2..000000000000
--- a/app-editors/vim/files/6.1.052
+++ /dev/null
@@ -1,150 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.052
-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.052
-Problem:    Unix: The executable() function doesn't work when the "which"
-	    command isn't available.
-Solution:   Go through $PATH manually.  Also makes it work for VMS.
-Files:	    src/os_unix.c
-
-
-*** ../vim61.051/src/os_unix.c	Wed May  1 19:40:35 2002
---- src/os_unix.c	Fri May  3 19:35:14 2002
-***************
-*** 2287,2294 ****
-  }
-  
-  #if defined(FEAT_EVAL) || defined(PROTO)
-  /*
-!  * Return 1 if "name" can be executed, 0 if not.
-   * Return -1 if unknown.
-   */
-      int
---- 2287,2311 ----
-  }
-  
-  #if defined(FEAT_EVAL) || defined(PROTO)
-+ 
-+ static int executable_file __ARGS((char_u *name));
-+ 
-  /*
-!  * Return 1 if "name" is an executable file, 0 if not or it doesn't exist.
-!  */
-!     static int
-! executable_file(name)
-!     char_u	*name;
-! {
-!     struct stat	st;
-! 
-!     if (stat((char *)name, &st))
-! 	return 0;
-!     return S_ISREG(st.st_mode) && mch_access((char *)name, X_OK) == 0;
-! }
-! 
-! /*
-!  * Return 1 if "name" can be found in $PATH and executed, 0 if not.
-   * Return -1 if unknown.
-   */
-      int
-***************
-*** 2296,2320 ****
-      char_u	*name;
-  {
-      char_u	*buf;
-!     char_u	*p;
-      int		retval;
-  
-! #ifdef VMS
-!     /* TODO */
-!     return -1;
-! #endif
-  
-!     buf = alloc((unsigned)STRLEN(name) + 7);
-      if (buf == NULL)
-  	return -1;
-!     sprintf((char *)buf, "which %s", name);
-!     p = get_cmd_output(buf, SHELL_SILENT);
-      vim_free(buf);
--     if (p == NULL)
-- 	return -1;
--     /* result can be: "name: Command not found" */
--     retval = (*p != NUL && strstr((char *)p, "not found") == NULL);
--     vim_free(p);
-      return retval;
-  }
-  #endif
---- 2313,2361 ----
-      char_u	*name;
-  {
-      char_u	*buf;
-!     char_u	*p, *e;
-      int		retval;
-  
-!     /* If it's an absolute or relative path don't need to use $PATH. */
-!     if (mch_isFullName(name) || (name[0] == '.' && (name[1] == '/'
-! 				      || (name[1] == '.' && name[2] == '/'))))
-! 	return executable_file(name);
-  
-!     p = (char_u *)getenv("PATH");
-!     if (p == NULL || *p == NUL)
-! 	return -1;
-!     buf = alloc((unsigned)(STRLEN(name) + STRLEN(p) + 2));
-      if (buf == NULL)
-  	return -1;
-! 
-!     /*
-!      * Walk through all entries in $PATH to check if "name" exists there and
-!      * is an executable file.
-!      */
-!     for (;;)
-!     {
-! 	e = (char_u *)strchr((char *)p, ':');
-! 	if (e == NULL)
-! 	    e = p + STRLEN(p);
-! 	if (e - p <= 1)		/* empty entry means current dir */
-! 	    STRCPY(buf, "./");
-! 	else
-! 	{
-! 	    STRNCPY(buf, p, e - p);
-! 	    buf[e - p] = NUL;
-! 	    add_pathsep(buf);
-! 	}
-! 	STRCAT(buf, name);
-! 	retval = executable_file(buf);
-! 	if (retval == 1)
-! 	    break;
-! 
-! 	if (*e != ':')
-! 	    break;
-! 	p = e + 1;
-!     }
-! 
-      vim_free(buf);
-      return retval;
-  }
-  #endif
-*** ../vim61.051/src/version.c	Sun May  5 14:29:43 2002
---- src/version.c	Sun May  5 14:30:52 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     52,
-  /**/
-
--- 
-Lawmakers made it obligatory for everybody to take at least one bath
-each week -- on Saturday night.
-		[real standing law in Vermont, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.053 b/app-editors/vim/files/6.1.053
deleted file mode 100644
index 1a82e5850580..000000000000
--- a/app-editors/vim/files/6.1.053
+++ /dev/null
@@ -1,83 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.053
-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.053
-Problem:    When 'sessionoptions' contains "globals", or "localoptions" and an
-	    option value contains a line break, the resulting script is wrong.
-Solution:   Use "\n" and "\r" for a line break. (Srinath Avadhanula)
-Files:	    src/eval.c
-
-
-*** ../vim61.052/src/eval.c	Sun Apr 21 15:46:47 2002
---- src/eval.c	Sun Apr 28 18:09:17 2002
-***************
-*** 8547,8553 ****
-      garray_T	*gap = &variables;		/* global variable */
-      VAR		this_var;
-      int		i;
-!     char_u	*p;
-  
-      for (i = gap->ga_len; --i >= 0; )
-      {
---- 8547,8553 ----
-      garray_T	*gap = &variables;		/* global variable */
-      VAR		this_var;
-      int		i;
-!     char_u	*p, *t;
-  
-      for (i = gap->ga_len; --i >= 0; )
-      {
-***************
-*** 8556,8563 ****
-  	{
-  	    if (var_flavour(this_var->var_name) == VAR_FLAVOUR_SESSION)
-  	    {
-  		p = vim_strsave_escaped(get_var_string(this_var),
-! 							    (char_u *)"\\\"");
-  		if ((fprintf(fd, "let %s = %c%s%c",
-  			    this_var->var_name,
-  			    (this_var->var_type == VAR_STRING) ? '"' : ' ',
---- 8556,8572 ----
-  	{
-  	    if (var_flavour(this_var->var_name) == VAR_FLAVOUR_SESSION)
-  	    {
-+ 		/* Escapse special characters with a backslash.  Turn a LF and
-+ 		 * CR into \n and \r. */
-  		p = vim_strsave_escaped(get_var_string(this_var),
-! 							(char_u *)"\\\"\n\r");
-! 		if (p == NULL)	    /* out of memory */
-! 		    continue;
-! 		for (t = p; *t != NUL; ++t)
-! 		    if (*t == '\n')
-! 			*t = 'n';
-! 		    else if (*t == '\r')
-! 			*t = 'r';
-  		if ((fprintf(fd, "let %s = %c%s%c",
-  			    this_var->var_name,
-  			    (this_var->var_type == VAR_STRING) ? '"' : ' ',
-*** ../vim61.052/src/version.c	Sun May  5 14:35:03 2002
---- src/version.c	Sun May  5 19:02:50 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     53,
-  /**/
-
--- 
-A law to reduce crime states: "It is mandatory for a motorist with criminal
-intentions to stop at the city limits and telephone the chief of police as he
-is entering the town.
-		[real standing law in Washington, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.054 b/app-editors/vim/files/6.1.054
deleted file mode 100644
index fd7123718009..000000000000
--- a/app-editors/vim/files/6.1.054
+++ /dev/null
@@ -1,236 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.054
-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.054
-Problem:    GUI: A mouse click is not recognized at the more prompt, even when
-	    'mouse' includes 'r'.
-Solution:   Recognize a mouse click at the more prompt.
-	    Also accept a mouse click in the last line in the GUI.
-	    Add "ml" entry in 'mouseshape'.
-Files:	    src/gui.c, src/message.c, src/misc1.c, src/misc2.c, src/option.c,
-	    src/structs.h
-
-
-*** ../vim61.053/src/gui.c	Sat May  4 22:23:07 2002
---- src/gui.c	Sun May  5 21:48:29 2002
-***************
-*** 2515,2521 ****
-  #endif
-  	case INSERT:
-  	case INSERT+LANGMAP:	checkfor = MOUSE_INSERT;	break;
-! 	case HITRETURN:		checkfor = MOUSE_RETURN;	break;
-  
-  	    /*
-  	     * On the command line, use the clipboard selection on all lines
---- 2515,2528 ----
-  #endif
-  	case INSERT:
-  	case INSERT+LANGMAP:	checkfor = MOUSE_INSERT;	break;
-! 	case ASKMORE:
-! 	case HITRETURN:		/* At the more- and hit-enter prompt pass the
-! 				   mouse event for a click on the last line. */
-! 				if (Y_2_ROW(y) == Rows - 1)
-! 				    checkfor = MOUSE_NORMAL;
-! 				else
-! 				    checkfor = MOUSE_RETURN;
-! 				break;
-  
-  	    /*
-  	     * On the command line, use the clipboard selection on all lines
-***************
-*** 3868,3874 ****
-      wp = mouse_find_win(&row, &col);
-  # ifdef FEAT_MOUSESHAPE
-      if (State == HITRETURN || State == ASKMORE)
-! 	update_mouseshape(SHAPE_IDX_MORE);
-      else if (row > wp->w_height)	/* below status line */
-  	update_mouseshape(SHAPE_IDX_CLINE);
-  #  ifdef FEAT_VERTSPLIT
---- 3875,3886 ----
-      wp = mouse_find_win(&row, &col);
-  # ifdef FEAT_MOUSESHAPE
-      if (State == HITRETURN || State == ASKMORE)
-!     {
-! 	if (Y_2_ROW(y) == Rows - 1)
-! 	    update_mouseshape(SHAPE_IDX_MOREL);
-! 	else
-! 	    update_mouseshape(SHAPE_IDX_MORE);
-!     }
-      else if (row > wp->w_height)	/* below status line */
-  	update_mouseshape(SHAPE_IDX_CLINE);
-  #  ifdef FEAT_VERTSPLIT
-*** ../vim61.053/src/message.c	Mon Apr 29 22:57:48 2002
---- src/message.c	Sun May  5 21:07:23 2002
-***************
-*** 792,797 ****
---- 792,798 ----
-  				|| c == K_RIGHTDRAG  || c == K_RIGHTRELEASE
-  				|| c == K_MOUSEDOWN  || c == K_MOUSEUP
-  				|| (!mouse_has(MOUSE_RETURN)
-+ 				    && mouse_row != Rows - 1
-  				    && (c == K_LEFTMOUSE
-  					|| c == K_MIDDLEMOUSE
-  					|| c == K_RIGHTMOUSE))
-***************
-*** 1748,1753 ****
---- 1749,1755 ----
-  			/*FALLTHROUGH*/
-  		    case ' ':		/* one extra page */
-  		    case K_PAGEDOWN:
-+ 		    case K_LEFTMOUSE:
-  			lines_left = Rows - 1;
-  			break;
-  
-*** ../vim61.053/src/misc1.c	Wed May  1 19:40:35 2002
---- src/misc1.c	Sun May  5 21:26:11 2002
-***************
-*** 2531,2537 ****
-  
-  /*
-   * Get a key stroke directly from the user.
-!  * Ignores mouse clicks and scrollbar events.
-   * Doesn't use vgetc(), because it syncs undo and eats mapped characters.
-   * Disadvantage: typeahead is ignored.
-   * Translates the interrupt character for unix to ESC.
---- 2531,2538 ----
-  
-  /*
-   * Get a key stroke directly from the user.
-!  * Ignores mouse clicks and scrollbar events, except a click for the left
-!  * button (used at the more prompt).
-   * Doesn't use vgetc(), because it syncs undo and eats mapped characters.
-   * Disadvantage: typeahead is ignored.
-   * Translates the interrupt character for unix to ESC.
-***************
-*** 2579,2597 ****
-  	    if (buf[1] == KS_MODIFIER
-  		    || n == K_IGNORE
-  #ifdef FEAT_MOUSE
-- 		    || n == K_LEFTMOUSE
-  		    || n == K_LEFTMOUSE_NM
-  		    || n == K_LEFTDRAG
-! 		    || n ==  K_LEFTRELEASE
-! 		    || n ==  K_LEFTRELEASE_NM
-! 		    || n ==  K_MIDDLEMOUSE
-! 		    || n ==  K_MIDDLEDRAG
-! 		    || n ==  K_MIDDLERELEASE
-! 		    || n ==  K_RIGHTMOUSE
-! 		    || n ==  K_RIGHTDRAG
-! 		    || n ==  K_RIGHTRELEASE
-! 		    || n ==  K_MOUSEDOWN
-! 		    || n ==  K_MOUSEUP
-  # ifdef FEAT_GUI
-  		    || n == K_VER_SCROLLBAR
-  		    || n == K_HOR_SCROLLBAR
---- 2580,2597 ----
-  	    if (buf[1] == KS_MODIFIER
-  		    || n == K_IGNORE
-  #ifdef FEAT_MOUSE
-  		    || n == K_LEFTMOUSE_NM
-  		    || n == K_LEFTDRAG
-! 		    || n == K_LEFTRELEASE
-! 		    || n == K_LEFTRELEASE_NM
-! 		    || n == K_MIDDLEMOUSE
-! 		    || n == K_MIDDLEDRAG
-! 		    || n == K_MIDDLERELEASE
-! 		    || n == K_RIGHTMOUSE
-! 		    || n == K_RIGHTDRAG
-! 		    || n == K_RIGHTRELEASE
-! 		    || n == K_MOUSEDOWN
-! 		    || n == K_MOUSEUP
-  # ifdef FEAT_GUI
-  		    || n == K_VER_SCROLLBAR
-  		    || n == K_HOR_SCROLLBAR
-*** ../vim61.053/src/misc2.c	Sun May  5 14:29:43 2002
---- src/misc2.c	Sun May  5 21:48:59 2002
-***************
-*** 2674,2679 ****
---- 2674,2680 ----
-      {0,	0, 0,   0L,   0L,   0L, 0, 0, "vs", SHAPE_MOUSE},
-      {0,	0, 0,   0L,   0L,   0L, 0, 0, "vd", SHAPE_MOUSE},
-      {0,	0, 0,   0L,   0L,   0L, 0, 0, "m", SHAPE_MOUSE},
-+     {0,	0, 0,   0L,   0L,   0L, 0, 0, "ml", SHAPE_MOUSE},
-      {0,	0, 0, 100L, 100L, 100L, 0, 0, "sm", SHAPE_CURSOR},
-  };
-  
-***************
-*** 2960,2966 ****
---- 2961,2973 ----
-  {
-  #ifdef FEAT_MOUSESHAPE
-      if (mouse && (State == HITRETURN || State == ASKMORE))
-+     {
-+ # ifdef FEAT_GUI
-+ 	if (Y_2_ROW(gui_mch_get_mouse_y()) == Rows - 1)
-+ 	    return SHAPE_IDX_MOREL;
-+ # endif
-  	return SHAPE_IDX_MORE;
-+     }
-      if (mouse && drag_status_line)
-  	return SHAPE_IDX_SDRAG;
-  # ifdef FEAT_VERTSPLIT
-*** ../vim61.053/src/option.c	Tue Apr  9 21:34:55 2002
---- src/option.c	Sun May  5 21:44:55 2002
-***************
-*** 1436,1442 ****
-      {"mouseshape",  "mouses",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
-  #ifdef FEAT_MOUSESHAPE
-  			    (char_u *)&p_mouseshape, PV_NONE,
-! 			    {(char_u *)"i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,v:rightup-arrow", (char_u *)0L}
-  #else
-  			    (char_u *)NULL, PV_NONE,
-  			    {(char_u *)NULL, (char_u *)0L}
---- 1436,1442 ----
-      {"mouseshape",  "mouses",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
-  #ifdef FEAT_MOUSESHAPE
-  			    (char_u *)&p_mouseshape, PV_NONE,
-! 			    {(char_u *)"i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,ml:up-arrow,v:rightup-arrow", (char_u *)0L}
-  #else
-  			    (char_u *)NULL, PV_NONE,
-  			    {(char_u *)NULL, (char_u *)0L}
-*** ../vim61.053/src/structs.h	Fri Feb 22 16:58:41 2002
---- src/structs.h	Sun May  5 21:46:09 2002
-***************
-*** 1487,1494 ****
-  #define SHAPE_IDX_VSEP	12	/* A vertical separator line */
-  #define SHAPE_IDX_VDRAG 13	/* dragging a vertical separator line */
-  #define SHAPE_IDX_MORE	14	/* Hit-return or More */
-! #define SHAPE_IDX_SM	15	/* showing matching paren */
-! #define SHAPE_IDX_COUNT	16
-  
-  #define SHAPE_BLOCK	0	/* block cursor */
-  #define SHAPE_HOR	1	/* horizontal bar cursor */
---- 1487,1495 ----
-  #define SHAPE_IDX_VSEP	12	/* A vertical separator line */
-  #define SHAPE_IDX_VDRAG 13	/* dragging a vertical separator line */
-  #define SHAPE_IDX_MORE	14	/* Hit-return or More */
-! #define SHAPE_IDX_MOREL	15	/* Hit-return or More in last line */
-! #define SHAPE_IDX_SM	16	/* showing matching paren */
-! #define SHAPE_IDX_COUNT	17
-  
-  #define SHAPE_BLOCK	0	/* block cursor */
-  #define SHAPE_HOR	1	/* horizontal bar cursor */
-*** ../vim61.053/src/version.c	Sun May  5 19:05:22 2002
---- src/version.c	Sun May  5 22:46:36 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     54,
-  /**/
-
--- 
-No children may attend school with their breath smelling of "wild onions."
-		[real standing law in West Virginia, United States of America]
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.055 b/app-editors/vim/files/6.1.055
deleted file mode 100644
index fb929415d7dc..000000000000
--- a/app-editors/vim/files/6.1.055
+++ /dev/null
@@ -1,147 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.055
-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.055
-Problem:    When editing a compressed file, Vim will inspect the contents to
-	    guess the filetype.
-Solution:   Don't source scripts.vim for .Z, .gz, .bz2, .zip and .tgz files.
-Files:	    runtime/filetype.vim, runtime/plugin/gzip.vim
-
-
-*** ../vim61.054/runtime/filetype.vim	Tue Apr 23 21:22:42 2002
---- runtime/filetype.vim	Mon May  6 22:16:57 2002
-***************
-*** 1,7 ****
-  " Vim support file to detect file types
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2002 Apr 23
-  
-  " Listen very carefully, I will say this only once
-  if exists("did_load_filetypes")
---- 1,7 ----
-  " Vim support file to detect file types
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last change:	2002 May 06
-  
-  " Listen very carefully, I will say this only once
-  if exists("did_load_filetypes")
-***************
-*** 31,36 ****
---- 31,41 ----
-  	\   exe "doau filetypedetect BufRead " . expand("<afile>:r") |
-  	\ endif
-  
-+ " Pattern used to match file names which should not be inspected.
-+ " Currently finds compressed files.
-+ if !exists("g:ft_ignore_pat")
-+   let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
-+ endif
-  
-  " Abaqus or Trasys
-  au BufNewFile,BufRead *.inp			call FTCheck_inp()
-***************
-*** 1286,1294 ****
-  
-  " Check for "*" after loading myfiletypefile, so that scripts.vim is only used
-  " when there are no matching file name extensions.
-  augroup filetypedetect
-! au BufNewFile,BufRead,StdinReadPost *
-! 	\ if !did_filetype() | runtime! scripts.vim | endif
-  
-  
-  " Extra checks for when no filetype has been detected now.  Mostly used for
---- 1303,1314 ----
-  
-  " Check for "*" after loading myfiletypefile, so that scripts.vim is only used
-  " when there are no matching file name extensions.
-+ " Don't do this for compressed files.
-  augroup filetypedetect
-! au BufNewFile,BufRead *
-! 	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
-! 	\ | runtime! scripts.vim | endif
-! au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
-  
-  
-  " Extra checks for when no filetype has been detected now.  Mostly used for
-***************
-*** 1365,1371 ****
-  
-  " Generic configuration file (check this last, it's just guessing!)
-  au BufNewFile,BufRead,StdinReadPost *
-! 	\ if !did_filetype()
-  	\    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
-  	\	|| getline(4) =~ '^#' || getline(5) =~ '^#') |
-  	\   setf conf |
---- 1385,1391 ----
-  
-  " Generic configuration file (check this last, it's just guessing!)
-  au BufNewFile,BufRead,StdinReadPost *
-! 	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
-  	\    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
-  	\	|| getline(4) =~ '^#' || getline(5) =~ '^#') |
-  	\   setf conf |
-*** ../vim61.054/runtime/plugin/gzip.vim	Thu Sep 20 19:57:29 2001
---- runtime/plugin/gzip.vim	Mon May  6 21:57:53 2002
-***************
-*** 1,6 ****
-  " Vim plugin for editing compressed files.
-  " Maintainer: Bram Moolenaar <Bram@vim.org>
-! " Last Change: 2001 Sep 20
-  
-  " Exit quickly when:
-  " - this plugin was already loaded
---- 1,6 ----
-  " Vim plugin for editing compressed files.
-  " Maintainer: Bram Moolenaar <Bram@vim.org>
-! " Last Change: 2002 May 06
-  
-  " Exit quickly when:
-  " - this plugin was already loaded
-***************
-*** 86,92 ****
-    let &l:ma = ma_save
-    " When uncompressed the whole buffer, do autocommands
-    if empty
-!     execute ":silent! doau BufReadPost " . expand("%:r")
-    endif
-  endfun
-  
---- 86,96 ----
-    let &l:ma = ma_save
-    " When uncompressed the whole buffer, do autocommands
-    if empty
-!     if &verbose >= 8
-!       execute "doau BufReadPost " . expand("%:r")
-!     else
-!       execute "silent! doau BufReadPost " . expand("%:r")
-!     endif
-    endif
-  endfun
-  
-*** ../vim61.054/src/version.c	Sun May  5 22:51:14 2002
---- src/version.c	Mon May  6 22:12:26 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     55,
-  /**/
-
--- 
-   [The rest of the ARMY stand around looking at a loss.]
-INSPECTOR END OF FILM: (picks up megaphone) All right!  Clear off!  Go on!
-                 "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  ///
diff --git a/app-editors/vim/files/6.1.056 b/app-editors/vim/files/6.1.056
deleted file mode 100644
index d52144ec84a2..000000000000
--- a/app-editors/vim/files/6.1.056
+++ /dev/null
@@ -1,101 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.056
-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.056
-Problem:    Loading the Syntax menu can take quite a bit of time.
-Solution:   Add the "skip_syntax_sel_menu" variable.  When its defined the
-	    available syntax files are not in the Syntax menu.
-Files:	    runtime/doc/gui.txt, runtime/menu.vim
-
-
-*** ../vim61.055/runtime/doc/gui.txt	Fri Mar 22 21:18:36 2002
---- runtime/doc/gui.txt	Tue May  7 20:44:57 2002
-***************
-*** 1,4 ****
-! *gui.txt*       For Vim version 6.1.  Last change: 2002 Feb 24
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
---- 1,4 ----
-! *gui.txt*       For Vim version 6.1.  Last change: 2002 May 07
-  
-  
-  		  VIM REFERENCE MANUAL    by Bram Moolenaar
-***************
-*** 424,429 ****
---- 424,432 ----
-  	:let did_install_default_menus = 1
-  If you also want to avoid the Syntax menu: >
-  	:let did_install_syntax_menu = 1
-+ If you do want the Syntax menu but not all the entries for each available
-+ syntax file (which take quite a bit of time to load): >
-+ 	:let skip_syntax_sel_menu = 1
-  <
-  							*bufmenu_maxlen*
-  The contents of the buffer menu can be controlled by setting the variables
-*** ../vim61.055/runtime/menu.vim	Sun Mar 24 15:18:44 2002
---- runtime/menu.vim	Tue May  7 20:42:09 2002
-***************
-*** 2,8 ****
-  " You can also use this as a start for your own set of menus.
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last Change:	2002 Mar 02
-  
-  " Note that ":an" (short for ":anoremenu") is often used to make a menu work
-  " in all modes and avoid side effects from mappings defined by the user.
---- 2,8 ----
-  " You can also use this as a start for your own set of menus.
-  "
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last Change:	2002 May 07
-  
-  " Note that ":an" (short for ":anoremenu") is often used to make a menu work
-  " in all modes and avoid side effects from mappings defined by the user.
-***************
-*** 913,918 ****
---- 913,922 ----
-  	\ && !exists("did_install_syntax_menu")
-    let did_install_syntax_menu = 1
-  
-+ " Skip setting up the individual syntax selection menus when
-+ " skip_syntax_sel_menu is defined (it takes quite a bit of time).
-+ if !exists("skip_syntax_sel_menu")
-+ 
-  " Define the SetSyn function, used for the Syntax menu entries.
-  " Set 'filetype' and also 'syntax' if it is manually selected.
-  fun! SetSyn(name)
-***************
-*** 1285,1290 ****
---- 1289,1296 ----
-      unlet s:syntax_menu_synonly
-    endif
-  endfun
-+ 
-+ endif " !exists("skip_syntax_sel_menu")
-  
-  an 50.210 &Syntax.&Off			:syn off<CR>
-  an 50.700 &Syntax.-SEP3-		<Nop>
-*** ../vim61.055/src/version.c	Mon May  6 22:21:01 2002
---- src/version.c	Tue May  7 20:47:44 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     56,
-  /**/
-
--- 
-This message contains 78% recycled characters.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.057 b/app-editors/vim/files/6.1.057
deleted file mode 100644
index d00bf91853a8..000000000000
--- a/app-editors/vim/files/6.1.057
+++ /dev/null
@@ -1,56 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.057
-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.057
-Problem:    An ESC inside a mapping doesn't work as documented when
-	    'insertmode' is set, it does go from Visual or Normal mode to
-	    Insert mode. (Benji Fisher)
-Solution:   Make it work as documented.
-Files:	    src/normal.c
-
-
-*** ../vim61.056/src/normal.c	Tue Apr  9 23:19:52 2002
---- src/normal.c	Tue May  7 21:04:39 2002
-***************
-*** 7578,7584 ****
-  
-      /* A CTRL-C is often used at the start of a menu.  When 'insertmode' is
-       * set return to Insert mode afterwards. */
-!     if (restart_edit == 0 && p_im
-  #ifdef FEAT_EX_EXTRA
-  	    && ex_normal_busy == 0
-  #endif
---- 7578,7584 ----
-  
-      /* A CTRL-C is often used at the start of a menu.  When 'insertmode' is
-       * set return to Insert mode afterwards. */
-!     if (restart_edit == 0 && goto_im()
-  #ifdef FEAT_EX_EXTRA
-  	    && ex_normal_busy == 0
-  #endif
-*** ../vim61.056/src/version.c	Tue May  7 20:49:56 2002
---- src/version.c	Tue May  7 21:11:39 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     57,
-  /**/
-
--- 
-I am always surprised in the Linux world how quickly solutions can be
-obtained.  (Imagine sending an email to Bill Gates, asking why Windows
-crashed, and how to fix it...  and then getting an answer that fixed the
-problem... <0>_<0> !)		              -- Mark Langdon
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.058 b/app-editors/vim/files/6.1.058
deleted file mode 100644
index 8d33c2f19b73..000000000000
--- a/app-editors/vim/files/6.1.058
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.058
-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.058
-Problem:    When there is a closed fold just above the first line in the
-	    window, using CTRL-X CTRL-Y in Insert mode will show only one line
-	    of the fold. (Alexey Marinichev)
-Solution:   Correct the topline by putting it at the start of the fold.
-Files:	    src/move.c
-
-
-*** ../vim61.057/src/move.c	Thu May  2 19:52:55 2002
---- src/move.c	Wed May  8 19:04:20 2002
-***************
-*** 1486,1491 ****
---- 1486,1494 ----
-  #else
-  	--curwin->w_topline;
-  #endif
-+ #ifdef FEAT_FOLDING
-+ 	hasFolding(curwin->w_topline, &curwin->w_topline, NULL);
-+ #endif
-  	--curwin->w_botline;	    /* approximate w_botline */
-  	curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE);
-      }
-*** ../vim61.057/src/version.c	Tue May  7 21:12:30 2002
---- src/version.c	Wed May  8 18:53:22 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     58,
-  /**/
-
--- 
-For large projects, Team Leaders use sophisticated project management software
-to keep track of who's doing what.  The software collects the lies and guesses
-of the project team and organizes them in to instantly outdated charts that
-are too boring to look at closely.  This is called "planning".
-				(Scott Adams - The Dilbert principle)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.059 b/app-editors/vim/files/6.1.059
deleted file mode 100644
index 9d74ac369015..000000000000
--- a/app-editors/vim/files/6.1.059
+++ /dev/null
@@ -1,109 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.059
-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.059
-Problem:    ":redir > ~/file" doesn't work. (Stephen Rasku)
-Solution:   Expand environment variables in the ":redir >" argument.
-Files:	    src/ex_docmd.c
-
-
-*** ../vim61.058/src/ex_docmd.c	Fri May  3 22:11:51 2002
---- src/ex_docmd.c	Wed May  8 19:38:04 2002
-***************
-*** 6446,6454 ****
-      exarg_T	*eap;
-  {
-      char	*mode;
-! #ifdef FEAT_BROWSE
-!     char_u	*browseFile = NULL;
-! #endif
-  
-      if (STRICMP(eap->arg, "END") == 0)
-  	close_redir();
---- 6446,6452 ----
-      exarg_T	*eap;
-  {
-      char	*mode;
-!     char_u	*fname;
-  
-      if (STRICMP(eap->arg, "END") == 0)
-  	close_redir();
-***************
-*** 6468,6490 ****
-  
-  	    close_redir();
-  
-  #ifdef FEAT_BROWSE
-  	    if (cmdmod.browse)
-  	    {
-  		browseFile = do_browse(TRUE, (char_u *)_("Save Redirection"),
-! 		       eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf);
-  		if (browseFile == NULL)
-  		    return;		/* operation cancelled */
-! 		eap->arg = browseFile;
-  		eap->forceit = TRUE;	/* since dialog already asked */
-  	    }
-  #endif
-  
-! 	    redir_fd = open_exfile(eap->arg, eap->forceit, mode);
-! 
-! #ifdef FEAT_BROWSE
-! 	    vim_free(browseFile);
-! #endif
-  	}
-  #ifdef FEAT_EVAL
-  	else if (*eap->arg == '@')
---- 6466,6492 ----
-  
-  	    close_redir();
-  
-+ 	    /* Expand environment variables and "~/". */
-+ 	    fname = expand_env_save(eap->arg);
-+ 	    if (fname == NULL)
-+ 		return;
-  #ifdef FEAT_BROWSE
-  	    if (cmdmod.browse)
-  	    {
-+ 		char_u	*browseFile;
-+ 
-  		browseFile = do_browse(TRUE, (char_u *)_("Save Redirection"),
-! 		       fname, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf);
-  		if (browseFile == NULL)
-  		    return;		/* operation cancelled */
-! 		vim_free(fname);
-! 		fname = browseFile;
-  		eap->forceit = TRUE;	/* since dialog already asked */
-  	    }
-  #endif
-  
-! 	    redir_fd = open_exfile(fname, eap->forceit, mode);
-! 	    vim_free(fname);
-  	}
-  #ifdef FEAT_EVAL
-  	else if (*eap->arg == '@')
-*** ../vim61.058/src/version.c	Sat May 11 20:33:53 2002
---- src/version.c	Sat May 11 20:44:08 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     59,
-  /**/
-
--- 
-At some point in the project somebody will start whining about the need to
-determine the project "requirements".  This involves interviewing people who
-don't know what they want but, curiously, know exactly when they need it.
-				(Scott Adams - The Dilbert principle)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.060 b/app-editors/vim/files/6.1.060
deleted file mode 100644
index 15997f8a83e5..000000000000
--- a/app-editors/vim/files/6.1.060
+++ /dev/null
@@ -1,66 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.060
-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.060
-Problem:    When 'virtualedit' is set and 'selection' is "exclusive", deleting
-	    a character just before a tab changes the tab into spaces.  Undo
-	    doesn't restore the tab. (Helmut Stiegler)
-Solution:   Don't replace the tab by spaces when it's not needed.  Correcly
-	    save the line before it's changed.
-Files:	    src/ops.c
-
-
-*** ../vim61.059/src/ops.c	Tue Apr  9 23:19:52 2002
---- src/ops.c	Wed May  8 20:43:00 2002
-***************
-*** 1663,1673 ****
-  		}
-  	    }
-  
-! 	    if (gchar_pos(&oap->end) == '\t')
-  	    {
-! 		/* save last line for undo if it's not also the first line */
-! 		if (oap->end.lnum != curwin->w_cursor.lnum
-! 			&& u_save((linenr_T)(oap->end.lnum - 1),
-  				       (linenr_T)(oap->end.lnum + 1)) == FAIL)
-  		    return FAIL;
-  		curwin->w_cursor = oap->end;
---- 1663,1674 ----
-  		}
-  	    }
-  
-! 	    /* Break a tab only when it's included in the area. */
-! 	    if (gchar_pos(&oap->end) == '\t'
-! 					  && oap->end.coladd < oap->inclusive)
-  	    {
-! 		/* save last line for undo */
-! 		if (u_save((linenr_T)(oap->end.lnum - 1),
-  				       (linenr_T)(oap->end.lnum + 1)) == FAIL)
-  		    return FAIL;
-  		curwin->w_cursor = oap->end;
-*** ../vim61.059/src/version.c	Sat May 11 20:47:01 2002
---- src/version.c	Sat May 11 20:47:51 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     60,
-  /**/
-
--- 
-You can test a person's importance in the organization by asking how much RAM
-his computer has.  Anybody who knows the answer to that question is not a
-decision-maker.
-				(Scott Adams - The Dilbert principle)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.061 b/app-editors/vim/files/6.1.061
deleted file mode 100644
index 42af817ac5d5..000000000000
--- a/app-editors/vim/files/6.1.061
+++ /dev/null
@@ -1,92 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.061
-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.061
-Problem:    When 'virtualedit' is set and 'selection' is "exclusive", a Visual
-	    selection that ends just after a tab doesn't include that tab in
-	    the highlighting.  (Helmut Stiegler)
-Solution:   Use a different way to exclude the character under the cursor.
-Files:	    src/screen.c
-
-
-*** ../vim61.060/src/screen.c	Sun Apr 28 22:17:31 2002
---- src/screen.c	Wed May  8 20:16:00 2002
-***************
-*** 2502,2508 ****
-  	    }
-  	    if (VIsual_mode != 'V' && lnum == bot->lnum)
-  	    {
-! 		if (*p_sel == 'e' && bot->col == 0)
-  		{
-  		    fromcol = -10;
-  		    tocol = MAXCOL;
---- 2502,2512 ----
-  	    }
-  	    if (VIsual_mode != 'V' && lnum == bot->lnum)
-  	    {
-! 		if (*p_sel == 'e' && bot->col == 0
-! #ifdef FEAT_VIRTUALEDIT
-! 			&& bot->coladd == 0
-! #endif
-! 		   )
-  		{
-  		    fromcol = -10;
-  		    tocol = MAXCOL;
-***************
-*** 2511,2528 ****
-  		{
-  		    pos = *bot;
-  		    if (*p_sel == 'e')
-  		    {
-! 			--pos.col;
-! #ifdef FEAT_MBYTE
-! 			if (has_mbyte)
-! 			{
-! 			    line = ml_get_buf(wp->w_buffer, lnum, FALSE);
-! 			    pos.col -= (*mb_head_off)(line, line + pos.col);
-! 			}
-! #endif
-  		    }
-- 		    getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol);
-- 		    ++tocol;
-  		}
-  	    }
-  	}
---- 2515,2526 ----
-  		{
-  		    pos = *bot;
-  		    if (*p_sel == 'e')
-+ 			getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL);
-+ 		    else
-  		    {
-! 			getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol);
-! 			++tocol;
-  		    }
-  		}
-  	    }
-  	}
-*** ../vim61.060/src/version.c	Sat May 11 20:50:39 2002
---- src/version.c	Sat May 11 20:55:26 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     61,
-  /**/
-
--- 
-The only way the average employee can speak to an executive is by taking a
-second job as a golf caddie.
-				(Scott Adams - The Dilbert principle)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.062 b/app-editors/vim/files/6.1.062
deleted file mode 100644
index 5299ea5c3d09..000000000000
--- a/app-editors/vim/files/6.1.062
+++ /dev/null
@@ -1,92 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.062
-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.062
-Problem:    The "man" filetype plugin doesn't work properly on Solaris 5.
-Solution:   Use a different way to detect that "man -s" should be used. (Hugh
-	    Sasse)
-Files:	    runtime/ftplugin/man.vim
-
-
-*** ../vim61.061/runtime/ftplugin/man.vim	Thu Sep 20 11:26:58 2001
---- runtime/ftplugin/man.vim	Sun May 12 14:17:41 2002
-***************
-*** 1,7 ****
-  " Vim filetype plugin file
-  " Language:	man
-  " Maintainer:	Nam SungHyun <namsh@kldp.org>
-! " Last Change:	2001 Sep 20
-  
-  " To make the ":Man" command available before editing a manual page, source
-  " this script from your startup vimrc file.
---- 1,7 ----
-  " Vim filetype plugin file
-  " Language:	man
-  " Maintainer:	Nam SungHyun <namsh@kldp.org>
-! " Last Change:	2002 May 12
-  
-  " To make the ":Man" command available before editing a manual page, source
-  " this script from your startup vimrc file.
-***************
-*** 41,47 ****
-  
-  let s:man_tag_depth = 0
-  
-! if $OSTYPE =~ "solaris"
-    let s:man_sect_arg = "-s"
-    let s:man_find_arg = "-l"
-  else
---- 41,47 ----
-  
-  let s:man_tag_depth = 0
-  
-! if system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
-    let s:man_sect_arg = "-s"
-    let s:man_find_arg = "-l"
-  else
-***************
-*** 80,86 ****
-  func <SID>FindPage(sect, page)
-    let where = system("/usr/bin/man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
-    if where !~ "^/"
-!     if substitute(where, ".* \\(.*$\\)", "\\1", "") !~ "^/"
-        return 0
-      endif
-    endif
---- 80,86 ----
-  func <SID>FindPage(sect, page)
-    let where = system("/usr/bin/man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
-    if where !~ "^/"
-!     if matchstr(where, " [^ ]*$") !~ "^ /"
-        return 0
-      endif
-    endif
-*** ../vim61.061/src/version.c	Sat May 11 20:59:21 2002
---- src/version.c	Sun May 12 14:28:12 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     62,
-  /**/
-
--- 
-A salesperson says:            Translation:
-"backward compatible"          Old technology
-"Premium"                      Overpriced
-"Can't keep it on the shelf"   Unavailable
-"Stands alone"                 Piece of shit
-"Proprietary"                  Incompatible
-				(Scott Adams - The Dilbert principle)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.063 b/app-editors/vim/files/6.1.063
deleted file mode 100644
index 573c0422cb0f..000000000000
--- a/app-editors/vim/files/6.1.063
+++ /dev/null
@@ -1,89 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.063
-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.063
-Problem:    Java indenting doesn't work properly.
-Solution:   Ignore comments when checking if the indent doesn't increase after
-	    a "}".
-Files:	    runtime/indent/java.vim
-
-
-*** ../vim61.062/runtime/indent/java.vim	Thu Feb 28 19:46:29 2002
---- runtime/indent/java.vim	Sun Apr 21 13:58:18 2002
-***************
-*** 1,7 ****
-  " Vim indent file
-  " Language:	Java
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last Change:	2002 Feb 28
-  
-  " Only load this indent file when no other was loaded.
-  if exists("b:did_indent")
---- 1,7 ----
-  " Vim indent file
-  " Language:	Java
-  " Maintainer:	Bram Moolenaar <Bram@vim.org>
-! " Last Change:	2002 Apr 21
-  
-  " Only load this indent file when no other was loaded.
-  if exists("b:did_indent")
-***************
-*** 66,72 ****
-  
-    " Below a line starting with "}" never indent more.  Needed for a method
-    " below a method with an indented "throws" clause.
-!   let lnum = prevnonblank(v:lnum - 1)
-    if getline(lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' && indent(lnum) < theIndent
-      let theIndent = indent(lnum)
-    endif
---- 66,88 ----
-  
-    " Below a line starting with "}" never indent more.  Needed for a method
-    " below a method with an indented "throws" clause.
-!   " First ignore comment lines.
-!   let lnum = v:lnum - 1
-!   while lnum > 1
-!     let lnum = prevnonblank(lnum)
-!     if getline(lnum) =~ '\*/\s*$'
-!       while getline(lnum) !~ '/\*' && lnum > 1
-! 	let lnum = lnum - 1
-!       endwhile
-!       if getline(lnum) =~ '^\s*/\*'
-! 	let lnum = lnum - 1
-!       endif
-!     elseif getline(lnum) =~ '^\s*//'
-!       let lnum = lnum - 1
-!     else
-!       break
-!     endif
-!   endwhile
-    if getline(lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' && indent(lnum) < theIndent
-      let theIndent = indent(lnum)
-    endif
-*** ../vim61.062/src/version.c	Sun May 12 14:36:14 2002
---- src/version.c	Sun May 12 18:42:46 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     63,
-  /**/
-
--- 
-While it's true that many normal people whould prefer not to _date_ an
-engineer, most normal people harbor an intense desire to _mate_ with them,
-thus producing engineerlike children who will have high-paying jobs long
-before losing their virginity.
-				(Scott Adams - The Dilbert principle)
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.064 b/app-editors/vim/files/6.1.064
deleted file mode 100644
index 5a79bbb5fac8..000000000000
--- a/app-editors/vim/files/6.1.064
+++ /dev/null
@@ -1,435 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.064
-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.064
-Problem:    The URLs that the netrw plugin recognized for ftp and rcp did not
-	    conform to the standard method://[user@]host[:port]/path.
-Solution:   Use ftp://[user@]host[[:#]port]/path, which supports both the new
-	    and the previous style.  Also added a bit of dav/cadaver support.
-	    (Charles Campbell)
-Files:	    runtime/plugin/netrw.vim
-
-
-*** ../vim61.063/runtime/plugin/netrw.vim	Fri Feb  8 16:50:03 2002
---- runtime/plugin/netrw.vim	Tue May 14 21:40:49 2002
-***************
-*** 1,13 ****
-  " netrw.vim: (global plugin) Handles file transfer across a network
-! " Last Change:	Jan 4, 2002
-  " Maintainer:	Charles E. Campbell, Jr. PhD   <cec@NgrOyphSon.gPsfAc.nMasa.gov>
-! " Version:	2.20
-  
-  " Credits:
-  "  Vim editor   by Bram Moolenaar (Thanks, Bram!)
-  "  rcp, ftp support by C Campbell <cec@NgrOyphSon.gPsfAc.nMasa.gov>
-  "  scp  support by raf            <raf@comdyn.com.au>
-  "  http support by Bram Moolenaar <bram@moolenaar.net>
-  "  inputsecret(), BufReadCmd, BufWriteCmd contributed by C Campbell
-  
-  " Debugging:
---- 1,14 ----
-  " netrw.vim: (global plugin) Handles file transfer across a network
-! " Last Change:	Apr 16, 2002
-  " Maintainer:	Charles E. Campbell, Jr. PhD   <cec@NgrOyphSon.gPsfAc.nMasa.gov>
-! " Version:	22
-  
-  " Credits:
-  "  Vim editor   by Bram Moolenaar (Thanks, Bram!)
-  "  rcp, ftp support by C Campbell <cec@NgrOyphSon.gPsfAc.nMasa.gov>
-  "  scp  support by raf            <raf@comdyn.com.au>
-  "  http support by Bram Moolenaar <bram@moolenaar.net>
-+ "  dav  support by C Campbell
-  "  inputsecret(), BufReadCmd, BufWriteCmd contributed by C Campbell
-  
-  " Debugging:
-***************
-*** 32,54 ****
-  "	  up the file.
-  
-  " Reading:
-! " :Nread ?				give help
-! " :Nread "machine:file"			uses rcp
-! " :Nread "machine file"			uses ftp with <.netrc>
-! " :Nread "machine id password file"	uses ftp
-! " :Nread "ftp://machine[#port]/file"	uses ftp  (autodetects <.netrc>)
-! " :Nread "http://[user@]machine/file"	uses http (wget)
-! " :Nread "rcp://machine/file"		uses rcp
-! " :Nread "scp://[user@]machine/file"	uses scp
-  
-  " Writing:
-! " :Nwrite ?				give help
-! " :Nwrite "machine:file"		uses rcp
-! " :Nwrite "machine file"		uses ftp with <.netrc>
-! " :Nwrite "machine id password file"	uses ftp
-! " :Nwrite "ftp://machine[#port]/file"	uses ftp  (autodetects <.netrc>)
-! " :Nwrite "rcp://machine/file"		uses rcp
-! " :Nwrite "scp://[user@]machine/file"	uses scp
-  " http: not supported!
-  
-  " User And Password Changing:
---- 33,57 ----
-  "	  up the file.
-  
-  " Reading:
-! " :Nread ?					give help
-! " :Nread "machine:file"				uses rcp
-! " :Nread "machine file"				uses ftp   with <.netrc>
-! " :Nread "machine id password file"		uses ftp
-! " :Nread "ftp://[user@]machine[[:#]port]/file"	uses ftp   autodetects <.netrc>
-! " :Nread "http://[user@]machine/file"		uses http  uses wget
-! " :Nread "rcp://[user@]machine/file"		uses rcp
-! " :Nread "scp://[user@]machine/file"		uses scp
-! " :Nread "dav://machine[:port]/file"		uses cadaver
-  
-  " Writing:
-! " :Nwrite ?					give help
-! " :Nwrite "machine:file"			uses rcp
-! " :Nwrite "machine file"			uses ftp   with <.netrc>
-! " :Nwrite "machine id password file"		uses ftp
-! " :Nwrite "ftp://[user@]machine[[:#]port]/file"	uses ftp   autodetects <.netrc>
-! " :Nwrite "rcp://[user@]machine/file"		uses rcp
-! " :Nwrite "scp://[user@]machine/file"		uses scp
-! " :Nwrite "dav://machine[:port]/file"		uses cadaver
-  " http: not supported!
-  
-  " User And Password Changing:
-***************
-*** 111,126 ****
-   endif
-  endif
-  
-! " Vimrc Support:
-! " Auto-detection for ftp://*, rcp://*, scp://*, and http://*
-  " Should make file transfers across networks transparent.  Currently I haven't
-  " supported appends.  Hey, gotta leave something for <netrw.vim> version 3!
-  if version >= 600
-   augroup Network
-    au!
-!   au BufReadCmd		ftp://*,rcp://*,scp://*,http://* exe "Nread 0r " . expand("<afile>") | exe "doau BufReadPost " . expand("<afile>")
-!   au FileReadCmd	ftp://*,rcp://*,scp://*,http://* exe "Nread "	 . expand("<afile>") | exe "doau BufReadPost " . expand("<afile>")
-!   au BufWriteCmd	ftp://*,rcp://*,scp://*		 exe "Nwrite "	 . expand("<afile>")
-   augroup END
-  endif
-  
---- 114,129 ----
-   endif
-  endif
-  
-! " Transparency Support:
-! " Auto-detection for ftp://*, rcp://*, scp://*, http://*, and dav://*
-  " Should make file transfers across networks transparent.  Currently I haven't
-  " supported appends.  Hey, gotta leave something for <netrw.vim> version 3!
-  if version >= 600
-   augroup Network
-    au!
-!   au BufReadCmd		ftp://*,rcp://*,scp://*,http://*,dav://* exe "Nread 0r " . expand("<afile>") | exe "doau BufReadPost " . expand("<afile>")
-!   au FileReadCmd	ftp://*,rcp://*,scp://*,http://*,dav://* exe "Nread "	 . expand("<afile>") | exe "doau BufReadPost " . expand("<afile>")
-!   au BufWriteCmd	ftp://*,rcp://*,scp://*,dav://*		 exe "Nwrite "	 . expand("<afile>")
-   augroup END
-  endif
-  
-***************
-*** 172,184 ****
-     " Reconstruct Choice if choice starts with '"'
-     if match(choice,"?") == 0
-      echo "NetRead Usage:"
-!     echo ":Nread machine:file                  uses rcp"
-!     echo ':Nread "machine file"                uses ftp with <.netrc>'
-!     echo ':Nread "machine id password file"    uses ftp'
-!     echo ':Nread ftp://machine[#port]/file     uses ftp  (autodetects <.netrc>)'
-!     echo ":Nread http://[user@]machine/file    uses http (wget)"
-!     echo ":Nread rcp://machine/file            uses rcp"
-!     echo ":Nread scp://[user@]machine/file     uses scp"
-      break
-     elseif match(choice,"^\"") != -1
-  "	Decho "DBG: reconstructing choice"
---- 175,188 ----
-     " Reconstruct Choice if choice starts with '"'
-     if match(choice,"?") == 0
-      echo "NetRead Usage:"
-!     echo ":Nread machine:path                      uses rcp"
-!     echo ':Nread "machine path"                    uses ftp   with <.netrc>'
-!     echo ':Nread "machine id password path"        uses ftp'
-!     echo ':Nread ftp://[user@]machine[:port]/path  uses ftp   autodetects <.netrc>'
-!     echo ":Nread http://[user@]machine/path        uses http  wget"
-!     echo ":Nread rcp://[user@]machine/path         uses rcp"
-!     echo ":Nread scp://[user@]machine/path         uses scp"
-!     echo ":Nread dav://machine[:port]/path         uses cadaver"
-      break
-     elseif match(choice,"^\"") != -1
-  "	Decho "DBG: reconstructing choice"
-***************
-*** 291,302 ****
-    elseif     b:netrw_method  == 5	" read with http (wget)
-  "	Decho "DBG: read via http (method #5)"
-     if match(b:netrw_fname,"#") == -1
-!     exe "!wget http://" . g:netrw_machine . "/" . b:netrw_fname . " -O " . tmpfile
-      let result = s:NetGetFile(readcmd, tmpfile)
-     else
-      let netrw_html= substitute(b:netrw_fname,"#.*$","","")
-      let netrw_tag = substitute(b:netrw_fname,"^.*#","","")
-!     exe "!wget http://" . g:netrw_machine . "/" . netrw_html . " -O " . tmpfile
-      let result = s:NetGetFile(readcmd, tmpfile)
-      exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"'
-     endif
---- 295,306 ----
-    elseif     b:netrw_method  == 5	" read with http (wget)
-  "	Decho "DBG: read via http (method #5)"
-     if match(b:netrw_fname,"#") == -1
-!     exe "!wget -O " . tmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname
-      let result = s:NetGetFile(readcmd, tmpfile)
-     else
-      let netrw_html= substitute(b:netrw_fname,"#.*$","","")
-      let netrw_tag = substitute(b:netrw_fname,"^.*#","","")
-!     exe "!wget -O " . tmpfile . " http://" . g:netrw_machine . "/" . netrw_html
-      let result = s:NetGetFile(readcmd, tmpfile)
-      exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"'
-     endif
-***************
-*** 305,310 ****
---- 309,328 ----
-     let b:netrw_lastfile = choice
-  
-    ".........................................
-+   " cadaver: Method #6
-+   elseif     b:netrw_method  == 6	" read with cadaver
-+ "	Decho "DBG: read via cadaver (method #6)"
-+    if g:netrw_cygwin == 1
-+     let cygtmpfile=substitute(tmpfile,'^\(\a\):','//\1/','e')
-+     exe "!cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . cygtmpfile
-+    else
-+ "	call Decho("DBG: !cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . tmpfile)
-+     exe "!cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . tmpfile
-+    endif
-+    let result = s:NetGetFile(readcmd, tmpfile)
-+    let b:netrw_lastfile = choice
-+ 
-+   ".........................................
-    else " Complain
-     echo "***warning*** unable to comply with your request<" . choice . ">"
-    endif
-***************
-*** 385,396 ****
-     " Reconstruct Choice if choice starts with '"'
-     if match(choice,"?") == 0
-      echo "NetWrite Usage:"
-!     echo ":Nwrite machine:file                  uses rcp"
-!     echo ":Nwrite \"machine file\"                uses ftp with <.netrc>"
-!     echo ":Nwrite \"machine id password file\"    uses ftp"
-!     echo ":Nwrite ftp://machine[#port]/file          uses ftp  (autodetects <.netrc>)"
-!     echo ":Nwrite rcp://machine/file          uses rcp"
-!     echo ":Nwrite scp://[user@]machine/file   uses scp"
-      break
-  
-     elseif match(choice,"^\"") != -1
---- 403,415 ----
-     " Reconstruct Choice if choice starts with '"'
-     if match(choice,"?") == 0
-      echo "NetWrite Usage:"
-!     echo ":Nwrite machine:path                  uses rcp"
-!     echo ":Nwrite \"machine path\"                uses ftp with <.netrc>"
-!     echo ":Nwrite \"machine id password path\"    uses ftp"
-!     echo ":Nwrite ftp://machine[#port]/path          uses ftp  (autodetects <.netrc>)"
-!     echo ":Nwrite rcp://machine/path          uses rcp"
-!     echo ":Nwrite scp://[user@]machine/path   uses scp"
-!     echo ":Nwrite dav://[user@]machine/path   uses cadaver"
-      break
-  
-     elseif match(choice,"^\"") != -1
-***************
-*** 475,480 ****
---- 494,510 ----
-     endif
-     let b:netrw_lastfile = choice
-  
-+   ".........................................
-+   " dav: Method #6
-+   elseif     b:netrw_method == 6	" write with cadaver
-+    if g:netrw_cygwin == 1
-+     let cygtmpfile=substitute(tmpfile,'^\(\a\):','//\1/','e')
-+     exe "!cadaver " . cygtmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname
-+    else
-+     exe "!cadaver " . tmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname
-+    endif
-+    let b:netrw_lastfile = choice
-+ 
-    else " Complain
-     echo "***warning*** unable to comply with your request<" . choice . ">"
-    endif
-***************
-*** 513,518 ****
---- 543,549 ----
-  "	     3: ftp + machine, id, password, and [path]filename
-  "	     4: scp
-  "	     5: http (wget)
-+ "	     6: cadaver
-  function! s:NetMethod(choice)  " globals: method machine id passwd fname
-  "	Decho "DBG: NetMethod(a:choice<".a:choice.">) {"
-  
-***************
-*** 523,550 ****
-   let g:netrw_port    = ""
-  
-   " Patterns:
-!  " mipf   : a:machine a:id password filename  Use ftp
-!  " mf	  : a:machine filename		      Use ftp + <.netrc> or g:netrw_uid g:netrw_passwd
-!  " ftpurm : ftp://host[#port]/filename	      Use ftp + <.netrc> or g:netrw_uid g:netrw_passwd
-!  " rcpurm : rcp://host/filename		      Use rcp
-!  " rcphf  : host:filename		      Use rcp
-!  " scpurm : scp://[user@]host/filename	      Use scp
-!  " httpurm: http://[user@]host/filename       Use wget
-   let mipf   = '\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)'
-   let mf     = '\(\S\+\)\s\+\(\S\+\)'
-!  let ftpurm = 'ftp://\([^/#]\{-}\)\(#\d\+\)\=/\(.*\)$'
-!  let rcpurm = 'rcp://\([^/]\{-}\)/\(.*\)$'
-!  let rcphf  = '\(\I\i*\):\(\S\+\)'
-   let scpurm = 'scp://\([^/]\{-}\)/\(.*\)$'
-!  let httpurm= 'http://\([^/]\{-}\)/\(.*\)$'
-  
-   " Determine Method
-!  " rcp://hostname/...path-to-file
-   if match(a:choice,rcpurm) == 0
-  "	Decho "DBG: NetMethod: rcp://..."
-    let b:netrw_method = 1
-!   let g:netrw_machine= substitute(a:choice,rcpurm,'\1',"")
-!   let b:netrw_fname  = substitute(a:choice,rcpurm,'\2',"")
-  
-   " scp://user@hostname/...path-to-file
-   elseif match(a:choice,scpurm) == 0
---- 554,587 ----
-   let g:netrw_port    = ""
-  
-   " Patterns:
-!  " mipf   : a:machine a:id password filename		Use ftp
-!  " mf	  : a:machine filename		      		Use ftp + <.netrc> or g:netrw_uid g:netrw_passwd
-!  " ftpurm : ftp://[user@]host[[#:]port]/filename	Use ftp + <.netrc> or g:netrw_uid g:netrw_passwd
-!  " rcpurm : rcp://[user@]host/filename			Use rcp
-!  " rcphf  : [user@]host:filename			Use rcp
-!  " scpurm : scp://[user@]host/filename			Use scp
-!  " httpurm: http://[user@]host/filename			Use wget
-!  " davurm : dav://host[:port]/path                      Use cadaver
-   let mipf   = '\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)'
-   let mf     = '\(\S\+\)\s\+\(\S\+\)'
-!  let ftpurm = 'ftp://\([^/@]@\)\=\([^/#:]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
-!  let rcpurm = 'rcp://\([^/@]@\)\=\([^/]\{-}\)/\(.*\)$'
-!  let rcphf  = '\([^@]\{-}@\)\=\(\I\i*\):\(\S\+\)'
-   let scpurm = 'scp://\([^/]\{-}\)/\(.*\)$'
-!  let httpurm= 'http://\([^/]\{-}\)\(/.*\)\=$'
-!  let davurm = 'dav://\([^/]\{-}\)/\(.*\)\=$'
-  
-   " Determine Method
-!  " rcp://user@hostname/...path-to-file
-   if match(a:choice,rcpurm) == 0
-  "	Decho "DBG: NetMethod: rcp://..."
-    let b:netrw_method = 1
-!   let userid         = substitute(a:choice,rcpurm,'\1',"")
-!   let g:netrw_machine= substitute(a:choice,rcpurm,'\2',"")
-!   let b:netrw_fname  = substitute(a:choice,rcpurm,'\3',"")
-!   if userid != ""
-!    let g:netrw_uid= userid
-!   endif
-  
-   " scp://user@hostname/...path-to-file
-   elseif match(a:choice,scpurm) == 0
-***************
-*** 553,573 ****
-    let g:netrw_machine= substitute(a:choice,scpurm,'\1',"")
-    let b:netrw_fname  = substitute(a:choice,scpurm,'\2',"")
-  
-!  " http://hostname/...path-to-file
-   elseif match(a:choice,httpurm) == 0
-  "	Decho "DBG: NetMethod: http://..."
-    let b:netrw_method = 5
-    let g:netrw_machine= substitute(a:choice,httpurm,'\1',"")
-    let b:netrw_fname  = substitute(a:choice,httpurm,'\2',"")
-  
-!  " ftp://hostname/...path-to-file
-   elseif match(a:choice,ftpurm) == 0
-  "	Decho "DBG: NetMethod: ftp://..."
-!   let g:netrw_machine= substitute(a:choice,ftpurm,'\1',"")
-!   let g:netrw_port   = substitute(a:choice,ftpurm,'\2',"")
-!   let b:netrw_fname  = substitute(a:choice,ftpurm,'\3',"")
-    if g:netrw_port != ""
-!     let g:netrw_port = substitute(g:netrw_port,"#","","")
-    endif
-    if exists("g:netrw_uid") && exists("g:netrw_passwd")
-     let b:netrw_method = 3
---- 590,620 ----
-    let g:netrw_machine= substitute(a:choice,scpurm,'\1',"")
-    let b:netrw_fname  = substitute(a:choice,scpurm,'\2',"")
-  
-!  " http://user@hostname/...path-to-file
-   elseif match(a:choice,httpurm) == 0
-  "	Decho "DBG: NetMethod: http://..."
-    let b:netrw_method = 5
-    let g:netrw_machine= substitute(a:choice,httpurm,'\1',"")
-    let b:netrw_fname  = substitute(a:choice,httpurm,'\2',"")
-+  
-+  " dav://hostname[:port]/..path-to-file..
-+  elseif match(a:choice,davurm) == 0
-+   let b:netrw_method= 6
-+   let g:netrw_machine= substitute(a:choice,davurm,'\1',"")
-+   let b:netrw_fname  = substitute(a:choice,davurm,'\2',"")
-  
-!  " ftp://[user@]hostname[[:#]port]/...path-to-file
-   elseif match(a:choice,ftpurm) == 0
-  "	Decho "DBG: NetMethod: ftp://..."
-!   let userid         = substitute(a:choice,ftpurm,'\1',"")
-!   let g:netrw_machine= substitute(a:choice,ftpurm,'\2',"")
-!   let g:netrw_port   = substitute(a:choice,ftpurm,'\3',"")
-!   let b:netrw_fname  = substitute(a:choice,ftpurm,'\4',"")
-    if g:netrw_port != ""
-!     let g:netrw_port = substitute(g:netrw_port,"[#:]","","")
-!   endif
-!   if userid != ""
-!    let g:netrw_uid= userid
-    endif
-    if exists("g:netrw_uid") && exists("g:netrw_passwd")
-     let b:netrw_method = 3
-***************
-*** 589,596 ****
-   elseif match(a:choice,rcphf) == 0
-  "	Decho "DBG: NetMethod: (rcp) host:file"
-    let b:netrw_method = 1
-!   let g:netrw_machine= substitute(a:choice,rcphf,'\1',"")
-!   let b:netrw_fname  = substitute(a:choice,rcphf,'\2',"")
-    if has("win32")
-     " don't let PCs try <.netrc>
-     let b:netrw_method = 3
---- 636,647 ----
-   elseif match(a:choice,rcphf) == 0
-  "	Decho "DBG: NetMethod: (rcp) host:file"
-    let b:netrw_method = 1
-!   let userid         = substitute(a:choice,rcphf,'\1',"")
-!   let g:netrw_machine= substitute(a:choice,rcphf,'\2',"")
-!   let b:netrw_fname  = substitute(a:choice,rcphf,'\3',"")
-!   if userid != ""
-!    let g:netrw_uid= userid
-!   endif
-    if has("win32")
-     " don't let PCs try <.netrc>
-     let b:netrw_method = 3
-*** ../vim61.063/src/version.c	Sun May 12 18:48:10 2002
---- src/version.c	Wed May 15 20:31:14 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     64,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-13. You refer to going to the bathroom as downloading.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.067 b/app-editors/vim/files/6.1.067
deleted file mode 100644
index b330bdbcd269..000000000000
--- a/app-editors/vim/files/6.1.067
+++ /dev/null
@@ -1,53 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.067
-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.067
-Problem:    ":set viminfo+=f0" is not working. (Benji Fisher)
-Solution:   Check the "f" flag instead of "'" in 'viminfo'.
-Files:	    src/mark.c
-
-
-*** ../vim61.066/src/mark.c	Mon Feb 11 14:51:37 2002
---- src/mark.c	Wed May 15 22:25:58 2002
-***************
-*** 1067,1073 ****
-      buf_T	*buf;
-      xfmark_T	*fm;
-  
-!     if (get_viminfo_parameter('\'') == 0)
-  	return;
-  
-      fprintf(fp, _("\n# File marks:\n"));
---- 1063,1069 ----
-      buf_T	*buf;
-      xfmark_T	*fm;
-  
-!     if (get_viminfo_parameter('f') == 0)
-  	return;
-  
-      fprintf(fp, _("\n# File marks:\n"));
-*** ../vim61.066/src/version.c	Wed May 15 22:00:04 2002
---- src/version.c	Wed May 15 22:29:28 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     67,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-22. You've already visited all the links at Yahoo and you're halfway through
-    Lycos.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.068 b/app-editors/vim/files/6.1.068
deleted file mode 100644
index a555cb0e09b0..000000000000
--- a/app-editors/vim/files/6.1.068
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.068
-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.068
-Problem:    When a file is reloaded after it was changed outside of Vim, diff
-	    mode isn't updated. (Michael Naumann)
-Solution:   Invalidate the diff info so that it's updated when needed.
-Files:	    src/fileio.c
-
-
-*** ../vim61.067/src/fileio.c	Mon Apr 29 21:53:23 2002
---- src/fileio.c	Thu May  9 19:41:25 2002
-***************
-*** 5258,5263 ****
---- 5258,5268 ----
-  	    }
-  	    vim_free(ea.cmd);
-  
-+ #ifdef FEAT_DIFF
-+ 	    /* Invalidate diff info if necessary. */
-+ 	    diff_invalidate();
-+ #endif
-+ 
-  	    /* Restore the topline and cursor position and check it (lines may
-  	     * have been removed). */
-  	    if (old_topline > curbuf->b_ml.ml_line_count)
-*** ../vim61.067/src/version.c	Wed May 15 22:31:55 2002
---- src/version.c	Thu May 16 21:30:20 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     68,
-  /**/
-
--- 
-"Making it up?  Why should I want to make anything up?  Life's bad enough
-as it is without wanting to invent any more of it."
-		-- Marvin, the Paranoid Android in Douglas Adams'
-		   "The Hitchhiker's Guide to the Galaxy"
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.069 b/app-editors/vim/files/6.1.069
deleted file mode 100644
index b6655fd15f13..000000000000
--- a/app-editors/vim/files/6.1.069
+++ /dev/null
@@ -1,70 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.069
-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.069
-Problem:    When 'showmatch' is set and "$" is in 'cpoptions', using
-	    "C}<Esc>" may forget to remove the "$". (Preben Guldberg)
-Solution:   Restore dollar_vcol after displaying the matching cursor position.
-Files:	    src/search.c
-
-
-*** ../vim61.068/src/search.c	Sun Apr 28 22:11:57 2002
---- src/search.c	Mon May 13 19:47:58 2002
-***************
-*** 2025,2030 ****
---- 2025,2031 ----
-  #ifdef CURSOR_SHAPE
-      int		    save_state;
-  #endif
-+     colnr_T	    save_dollar_vcol;
-  
-      if ((lpos = findmatch(NULL, NUL)) == NULL)	    /* no match, so beep */
-  	vim_beep();
-***************
-*** 2045,2050 ****
---- 2046,2052 ----
-  	    ++curwin->w_virtcol;	/* do display ')' just before "$" */
-  	    update_screen(VALID);	/* show the new char first */
-  
-+ 	    save_dollar_vcol = dollar_vcol;
-  #ifdef CURSOR_SHAPE
-  	    save_state = State;
-  	    State = SHOWMATCH;
-***************
-*** 2063,2068 ****
---- 2065,2074 ----
-  		gui_mch_flush();
-  	    }
-  #endif
-+ 	    /* Restore collar_vcol(), because setcursor() may call curs_rows()
-+ 	     * which resets it if the matching position is in a previous line
-+ 	     * and has a higher column number. */
-+ 	    dollar_vcol = save_dollar_vcol;
-  
-  	    /*
-  	     * brief pause, unless 'm' is present in 'cpo' and a character is
-*** ../vim61.068/src/version.c	Thu May 16 21:32:05 2002
---- src/version.c	Thu May 16 21:33:43 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     69,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-1. At lunch time, sit in your parked car with sunglasses on and point
-   a hair dryer at passing cars. See if they slow down.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.070 b/app-editors/vim/files/6.1.070
deleted file mode 100644
index e8a762eeea5c..000000000000
--- a/app-editors/vim/files/6.1.070
+++ /dev/null
@@ -1,52 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.070
-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.070 (depends on 6.1.060)
-Problem:    Compiler warning for signed/unsigned mismatch. (Mike Williams)
-Solution:   Add a typecast to int.
-Files:	    src/ops.c
-
-
-*** ../vim61.069/src/ops.c	Sat May 11 20:50:39 2002
---- src/ops.c	Thu May 16 20:01:35 2002
-***************
-*** 1665,1671 ****
-  
-  	    /* Break a tab only when it's included in the area. */
-  	    if (gchar_pos(&oap->end) == '\t'
-! 					  && oap->end.coladd < oap->inclusive)
-  	    {
-  		/* save last line for undo */
-  		if (u_save((linenr_T)(oap->end.lnum - 1),
---- 1670,1676 ----
-  
-  	    /* Break a tab only when it's included in the area. */
-  	    if (gchar_pos(&oap->end) == '\t'
-! 				     && (int)oap->end.coladd < oap->inclusive)
-  	    {
-  		/* save last line for undo */
-  		if (u_save((linenr_T)(oap->end.lnum - 1),
-*** ../vim61.069/src/version.c	Thu May 16 21:41:07 2002
---- src/version.c	Thu May 16 21:43:15 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     70,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-2. Page yourself over the intercom. Don't disguise your voice.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.071 b/app-editors/vim/files/6.1.071
deleted file mode 100644
index b28be647388a..000000000000
--- a/app-editors/vim/files/6.1.071
+++ /dev/null
@@ -1,49 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.071
-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.071
-Problem:    When 'selection' is exclusive, g CTRL-G in Visual mode counts one
-	    character too much. (David Necas)
-Solution:   Subtract one from the end position.
-Files:	    src/ops.c
-
-
-*** ../vim61.070/src/ops.c	Thu May 16 21:44:52 2002
---- src/ops.c	Thu May 16 20:01:35 2002
-***************
-*** 5489,5494 ****
---- 5521,5529 ----
-  		min_pos = curwin->w_cursor;
-  		max_pos = VIsual;
-  	    }
-+ 	    if (*p_sel == 'e' && max_pos.col > 0)
-+ 		--max_pos.col;
-+ 
-  	    if (VIsual_mode == Ctrl_V)
-  	    {
-  		oparg.is_VIsual = 1;
-*** ../vim61.070/src/version.c	Thu May 16 21:44:52 2002
---- src/version.c	Thu May 16 21:46:44 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     71,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-3. Every time someone asks you to do something, ask if they want fries
-   with that.
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.072 b/app-editors/vim/files/6.1.072
deleted file mode 100644
index 74f319275ab4..000000000000
--- a/app-editors/vim/files/6.1.072
+++ /dev/null
@@ -1,208 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.072
-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.072
-Problem:    When a file name in a tags file starts with http:// or something
-	    else for which there is a BufReadCmd autocommand, the file isn't
-	    opened anyway.
-Solution:   Check if there is a matching BufReadCmd autocommand and try to
-	    open the file.
-Files:	    src/fileio.c, src/proto/fileio.pro, src/tag.c
-
-
-*** ../vim61.071/src/fileio.c	Thu May 16 21:32:05 2002
---- src/fileio.c	Thu May 16 21:59:24 2002
-***************
-*** 5767,5772 ****
---- 5767,5794 ----
-  static EVENT_T	last_event;
-  static int	last_group;
-  
-+ #ifdef BACKSLASH_IN_FILENAME
-+ static void forward_slash __ARGS((char_u *));
-+ 
-+ /*
-+  * Convert all backslashes in fname to forward slashes in-place.
-+  */
-+     static void
-+ forward_slash(fname)
-+     char_u	*fname;
-+ {
-+     for (p = fname; *p != NUL; ++p)
-+ # ifdef  FEAT_MBYTE
-+ 	/* The Big5 encoding can have '\' in the trail byte. */
-+ 	if (enc_dbcs != 0 && (*mb_ptr2len_check)(p) > 1)
-+ 	    ++p;
-+ 	else
-+ # endif
-+ 	if (*p == '\\')
-+ 	    *p = '/';
-+ }
-+ #endif
-+ 
-  /*
-   * Show the autocommands for one AutoPat.
-   */
-***************
-*** 6900,6930 ****
-      /*
-       * Replace all backslashes with forward slashes.  This makes the
-       * autocommand patterns portable between Unix and MS-DOS.
--      * Watch out for the Big5 encoding, it has '\' in the trail byte.
-       */
-!     {
-! 	char_u	    *p;
-! 
-! 	if (sfname != NULL)
-! 	{
-! 	    for (p = sfname; *p; ++p)
-! # ifdef  FEAT_MBYTE
-! 		if (enc_dbcs != 0 && (*mb_ptr2len_check)(p) > 1)
-! 		    ++p;
-! 		else
-! # endif
-! 		if (*p == '\\')
-! 		    *p = '/';
-! 	}
-! 	for (p = fname; *p; ++p)
-! # ifdef  FEAT_MBYTE
-! 	    if (enc_dbcs != 0 && (*mb_ptr2len_check)(p) > 1)
-! 		++p;
-! 	    else
-! # endif
-! 	    if (*p == '\\')
-! 		*p = '/';
-!     }
-  #endif
-  
-  #ifdef VMS
---- 6922,6931 ----
-      /*
-       * Replace all backslashes with forward slashes.  This makes the
-       * autocommand patterns portable between Unix and MS-DOS.
-       */
-!     if (sfname != NULL)
-! 	forward_slash(sfname);
-!     forward_slash(fname);
-  #endif
-  
-  #ifdef VMS
-***************
-*** 7179,7184 ****
---- 7180,7230 ----
-  	acp->nextcmd = NULL;
-      else
-  	acp->nextcmd = ac->next;
-+     return retval;
-+ }
-+ 
-+ /*
-+  * Return TRUE if there is a matching autocommand for "fname".
-+  */
-+     int
-+ has_autocmd(event, sfname)
-+     EVENT_T	event;
-+     char_u	*sfname;
-+ {
-+     AutoPat	*ap;
-+     char_u	*fname;
-+     char_u	*tail = gettail(sfname);
-+     int		retval = FALSE;
-+ 
-+     fname = FullName_save(sfname, FALSE);
-+     if (fname == NULL)
-+ 	return FALSE;
-+ 
-+ #ifdef BACKSLASH_IN_FILENAME
-+     /*
-+      * Replace all backslashes with forward slashes.  This makes the
-+      * autocommand patterns portable between Unix and MS-DOS.
-+      */
-+     sfname = vim_strsave(sfname);
-+     if (sfname != NULL)
-+ 	forward_slash(sfname);
-+     forward_slash(fname);
-+ #endif
-+ 
-+     for (ap = first_autopat[(int)event]; ap != NULL; ap = ap->next)
-+ 	if (ap->pat != NULL && ap->cmds != NULL
-+ 		&& match_file_pat(ap->reg_pat, fname, sfname, tail,
-+ 							      ap->allow_dirs))
-+ 	{
-+ 	    retval = TRUE;
-+ 	    break;
-+ 	}
-+ 
-+     vim_free(fname);
-+ #ifdef BACKSLASH_IN_FILENAME
-+     vim_free(sfname);
-+ #endif
-+ 
-      return retval;
-  }
-  
-*** ../vim61.071/src/proto/fileio.pro	Fri Mar 22 21:41:09 2002
---- src/proto/fileio.pro	Mon May  6 19:55:39 2002
-***************
-*** 25,30 ****
---- 25,31 ----
-  void aucmd_restbuf __ARGS((aco_save_T *aco));
-  int apply_autocmds __ARGS((EVENT_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf));
-  int has_cursorhold __ARGS((void));
-+ int has_autocmd __ARGS((EVENT_T event, char_u *sfname));
-  char_u *get_augroup_name __ARGS((expand_T *xp, int idx));
-  char_u *set_context_in_autocmd __ARGS((expand_T *xp, char_u *arg, int doautocmd));
-  char_u *get_event_name __ARGS((expand_T *xp, int idx));
-*** ../vim61.071/src/tag.c	Mon Apr  8 22:11:31 2002
---- src/tag.c	Mon May  6 19:57:34 2002
-***************
-*** 2430,2438 ****
-      tofree_fname = fname;	/* free() it later */
-  
-      /*
-!      * check if file for tag exists before abandoning current file
-       */
-!     if (mch_getperm(fname) < 0)
-      {
-  	retval = NOTAGFILE;
-  	vim_free(nofile_fname);
---- 2430,2444 ----
-      tofree_fname = fname;	/* free() it later */
-  
-      /*
-!      * Check if the file with the tag exists before abandoning the current
-!      * file.  Also accept a file name for which there is a matching BufReadCmd
-!      * autocommand event (e.g., http://sys/file).
-       */
-!     if (mch_getperm(fname) < 0
-! #ifdef FEAT_AUTOCMD
-! 	    && !has_autocmd(EVENT_BUFREADCMD, fname)
-! #endif
-!        )
-      {
-  	retval = NOTAGFILE;
-  	vim_free(nofile_fname);
-*** ../vim61.071/src/version.c	Thu May 16 21:50:46 2002
---- src/version.c	Thu May 16 21:54:47 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     72,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-4. Put your garbage can on your desk and label it "in".
-
- ///  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  ///
diff --git a/app-editors/vim/files/6.1.074 b/app-editors/vim/files/6.1.074
deleted file mode 100644
index 720d3b25bb33..000000000000
--- a/app-editors/vim/files/6.1.074
+++ /dev/null
@@ -1,253 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 6.1.074
-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.074
-Problem:    When 'cdpath' includes "../..", changing to a directory in which
-	    we currently already are doesn't work.  ff_check_visited() adds
-	    the directory both when using it as the root for searching and for
-	    the actual matches. (Stephen Rasku)
-Solution:   Use a separate list for the already searched directories.
-Files:	    src/misc2.c
-
-
-*** ../vim61.073/src/misc2.c	Sun May  5 22:51:14 2002
---- src/misc2.c	Sun May  5 21:48:59 2002
-***************
-*** 3318,3324 ****
-  
-  /*
-   * We might have to manage several visited lists during a search.
-!  * This is expecially needed for * the tags option. If tags is set to:
-   *      "./++/tags,./++/TAGS,++/tags"  (replace + with *)
-   * So we have to do 3 searches:
-   *   1) search from the current files directory downward for the file "tags"
---- 3318,3324 ----
-  
-  /*
-   * We might have to manage several visited lists during a search.
-!  * This is expecially needed for the tags option. If tags is set to:
-   *      "./++/tags,./++/TAGS,++/tags"  (replace + with *)
-   * So we have to do 3 searches:
-   *   1) search from the current files directory downward for the file "tags"
-***************
-*** 3351,3357 ****
---- 3351,3359 ----
-   * The search context:
-   *   ffsc_stack_ptr:	the stack for the dirs to search
-   *   ffsc_visited_list: the currently active visited list
-+  *   ffsc_dir_visited_list: the currently active visited list for search dirs
-   *   ffsc_visited_lists_list: the list of all visited lists
-+  *   ffsc_dir_visited_lists_list: the list of all visited lists for search dirs
-   *   ffsc_file_to_search:     the file to search for
-   *   ffsc_start_dir:	the starting directory, if search path was relative
-   *   ffsc_fix_path:	the fix part of the given path (without wildcards)
-***************
-*** 3365,3371 ****
---- 3367,3375 ----
-  {
-       ff_stack_T			*ffsc_stack_ptr;
-       ff_visited_list_hdr_T	*ffsc_visited_list;
-+      ff_visited_list_hdr_T	*ffsc_dir_visited_list;
-       ff_visited_list_hdr_T	*ffsc_visited_lists_list;
-+      ff_visited_list_hdr_T	*ffsc_dir_visited_lists_list;
-       char_u			*ffsc_file_to_search;
-       char_u			*ffsc_start_dir;
-       char_u			*ffsc_fix_path;
-***************
-*** 3387,3394 ****
-  #else
-  static int ff_check_visited __ARGS((ff_visited_T **, char_u *));
-  #endif
-  static void ff_free_visited_list __ARGS((ff_visited_T *vl));
-! static ff_visited_list_hdr_T* ff_get_visited_list __ARGS((char_u *));
-  #ifdef FEAT_PATH_EXTRA
-  static int ff_wc_equal __ARGS((char_u *s1, char_u *s2));
-  #endif
---- 3391,3399 ----
-  #else
-  static int ff_check_visited __ARGS((ff_visited_T **, char_u *));
-  #endif
-+ static void vim_findfile_free_visited_list __ARGS((ff_visited_list_hdr_T **list_headp));
-  static void ff_free_visited_list __ARGS((ff_visited_T *vl));
-! static ff_visited_list_hdr_T* ff_get_visited_list __ARGS((char_u *, ff_visited_list_hdr_T **list_headp));
-  #ifdef FEAT_PATH_EXTRA
-  static int ff_wc_equal __ARGS((char_u *s1, char_u *s2));
-  #endif
-***************
-*** 3541,3549 ****
-  	 * filename. If no list for the current filename exists, creates a new
-  	 * one.
-  	 */
-! 	ff_search_ctx->ffsc_visited_list = ff_get_visited_list(filename);
-  	if (ff_search_ctx->ffsc_visited_list == NULL)
-  	    goto error_return;
-      }
-  
-      if (ff_expand_buffer == NULL)
---- 3546,3559 ----
-  	 * filename. If no list for the current filename exists, creates a new
-  	 * one.
-  	 */
-! 	ff_search_ctx->ffsc_visited_list = ff_get_visited_list(filename,
-! 				     &ff_search_ctx->ffsc_visited_lists_list);
-  	if (ff_search_ctx->ffsc_visited_list == NULL)
-  	    goto error_return;
-+ 	ff_search_ctx->ffsc_dir_visited_list = ff_get_visited_list(filename,
-+ 				 &ff_search_ctx->ffsc_dir_visited_lists_list);
-+ 	if (ff_search_ctx->ffsc_dir_visited_list == NULL)
-+ 	    goto error_return;
-      }
-  
-      if (ff_expand_buffer == NULL)
-***************
-*** 3915,3921 ****
-  	     * first time (hence ctx->ff_filearray == NULL)
-  	     */
-  	    if (ctx->ffs_filearray == NULL
-! 		    && ff_check_visited(&ff_search_ctx->ffsc_visited_list
-  							  ->ffvl_visited_list,
-  			ctx->ffs_fix_path
-  #ifdef FEAT_PATH_EXTRA
---- 3925,3931 ----
-  	     * first time (hence ctx->ff_filearray == NULL)
-  	     */
-  	    if (ctx->ffs_filearray == NULL
-! 		    && ff_check_visited(&ff_search_ctx->ffsc_dir_visited_list
-  							  ->ffvl_visited_list,
-  			ctx->ffs_fix_path
-  #ifdef FEAT_PATH_EXTRA
-***************
-*** 4282,4305 ****
-  vim_findfile_free_visited(search_ctx)
-      void	*search_ctx;
-  {
-!     ff_visited_list_hdr_T *vp;
-! 
-!     if (NULL == search_ctx)
-  	return;
-  
-!     ff_search_ctx = (ff_search_ctx_T*)search_ctx;
-  
-!     while (NULL != ff_search_ctx->ffsc_visited_lists_list)
-      {
-! 	vp = ff_search_ctx->ffsc_visited_lists_list->ffvl_next;
-! 	ff_free_visited_list(
-! 		ff_search_ctx->ffsc_visited_lists_list->ffvl_visited_list);
-! 
-! 	vim_free(ff_search_ctx->ffsc_visited_lists_list->ffvl_filename);
-! 	vim_free(ff_search_ctx->ffsc_visited_lists_list);
-! 	ff_search_ctx->ffsc_visited_lists_list = vp;
-      }
-!     ff_search_ctx->ffsc_visited_lists_list = NULL;
-  }
-  
-      static void
---- 4292,4322 ----
-  vim_findfile_free_visited(search_ctx)
-      void	*search_ctx;
-  {
-!     if (search_ctx == NULL)
-  	return;
-  
-!     ff_search_ctx = (ff_search_ctx_T *)search_ctx;
-! 
-!     vim_findfile_free_visited_list(&ff_search_ctx->ffsc_visited_lists_list);
-!     vim_findfile_free_visited_list(&ff_search_ctx->ffsc_dir_visited_lists_list);
-! }
-  
-!     static void
-! vim_findfile_free_visited_list(list_headp)
-!     ff_visited_list_hdr_T	**list_headp;
-! {
-!     ff_visited_list_hdr_T *vp;
-! 
-!     while (*list_headp != NULL)
-      {
-! 	vp = (*list_headp)->ffvl_next;
-! 	ff_free_visited_list((*list_headp)->ffvl_visited_list);
-! 
-! 	vim_free((*list_headp)->ffvl_filename);
-! 	vim_free(*list_headp);
-! 	*list_headp = vp;
-      }
-!     *list_headp = NULL;
-  }
-  
-      static void
-***************
-*** 4322,4336 ****
-   * allocates a new one.
-   */
-      static ff_visited_list_hdr_T*
-! ff_get_visited_list(filename)
-!     char_u	*filename;
-  {
-      ff_visited_list_hdr_T  *retptr = NULL;
-  
-      /* check if a visited list for the given filename exists */
-!     if (ff_search_ctx->ffsc_visited_lists_list!= NULL)
-      {
-! 	retptr = ff_search_ctx->ffsc_visited_lists_list;
-  	while (retptr != NULL)
-  	{
-  	    if (fnamecmp(filename, retptr->ffvl_filename) == 0)
---- 4339,4354 ----
-   * allocates a new one.
-   */
-      static ff_visited_list_hdr_T*
-! ff_get_visited_list(filename, list_headp)
-!     char_u			*filename;
-!     ff_visited_list_hdr_T	**list_headp;
-  {
-      ff_visited_list_hdr_T  *retptr = NULL;
-  
-      /* check if a visited list for the given filename exists */
-!     if (*list_headp != NULL)
-      {
-! 	retptr = *list_headp;
-  	while (retptr != NULL)
-  	{
-  	    if (fnamecmp(filename, retptr->ffvl_filename) == 0)
-***************
-*** 4380,4387 ****
-  	vim_free(retptr);
-  	return NULL;
-      }
-!     retptr->ffvl_next = ff_search_ctx->ffsc_visited_lists_list;
-!     ff_search_ctx->ffsc_visited_lists_list = retptr;
-  
-      return retptr;
-  }
---- 4398,4405 ----
-  	vim_free(retptr);
-  	return NULL;
-      }
-!     retptr->ffvl_next = *list_headp;
-!     *list_headp = retptr;
-  
-      return retptr;
-  }
-*** ../vim61.073/src/version.c	Thu May 16 22:08:09 2002
---- src/version.c	Thu May 16 22:10:38 2002
-***************
-*** 608,609 ****
---- 608,611 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     74,
-  /**/
-
--- 
-How To Keep A Healthy Level Of Insanity:
-6. In the memo field of all your checks, write "for sexual favors".
-
- ///  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  ///
diff --git a/app-editors/vim/files/digest-vim-6.1-r9 b/app-editors/vim/files/digest-vim-6.1-r9
new file mode 100644
index 000000000000..6d79c8d46d12
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.1-r9
@@ -0,0 +1,2 @@
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 2461430c2ca19a7ec2d6e2edcda567d1 vimpatch-1-142.tar.bz2 187947
diff --git a/app-editors/vim/files/rphillips-invalcolorpatch.diff b/app-editors/vim/files/rphillips-invalcolorpatch.diff
new file mode 100644
index 000000000000..1284900fccce
--- /dev/null
+++ b/app-editors/vim/files/rphillips-invalcolorpatch.diff
@@ -0,0 +1,18 @@
+Common subdirectories: src.orig/auto and src/auto
+diff -u src.orig/gui.h src/gui.h
+--- src.orig/gui.h	Mon Jul 29 23:06:39 2002
++++ src/gui.h	Mon Jul 29 23:06:52 2002
+@@ -225,6 +225,10 @@
+ 				   be "Pixel", but that's an unsigned and we
+ 				   need a signed value */
+ 
++#define INVALCOLOR (guicolor_T)-11111	/* number for invalid color; on 32 bit
++				   displays there is a tiny chance this is an
++				   actual color */
++
+ #ifdef FEAT_GUI_GTK
+   typedef GdkFont	*GuiFont;	/* handle for a GUI font */
+   typedef GdkFont	*GuiFontset;	/* handle for a GUI fontset */
+Common subdirectories: src.orig/proto and src/proto
+Common subdirectories: src.orig/testdir and src/testdir
+Common subdirectories: src.orig/xxd and src/xxd
diff --git a/app-editors/vim/vim-6.1-r9.ebuild b/app-editors/vim/vim-6.1-r9.ebuild
new file mode 100644
index 000000000000..23688c1e2239
--- /dev/null
+++ b/app-editors/vim/vim-6.1-r9.ebuild
@@ -0,0 +1,207 @@
+# Copyright 2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r9.ebuild,v 1.1 2002/07/30 07:23:13 rphillips Exp $
+
+# Please name the ebuild as follows.  If this is followed, there
+# should be no need to modify this ebuild when the Vim version is
+# updated.  (Yes it's overkill, but it was fun!)
+#
+#   vim-6.0, when 6.0 is finally released
+#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
+#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
+#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
+#
+# Quick reference:
+#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
+#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
+#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
+#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
+#
+# (08 Sep 2001 agriffis)
+
+# Calculate the version based on the name of the ebuild
+vim_version="${PV%_pre*}"
+vim_pre="${PV##*_pre}"
+if [ "$vim_version" = "$vim_pre" ]; then
+	# Final releases prior to 6.0 include a dash and decimal point in
+	# the directory name
+	if [ "${vim_version%%.*}" -lt 6 ]; then
+		S="$WORKDIR/vim-$vim_version"
+	else
+		S="$WORKDIR/vim${vim_version//.}"
+	fi
+	vim_letters=
+	A="vim-$vim_version.tar.bz2"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
+			 ftp://ftp.us.vim.org/pub/vim/unix/$A
+			 http://www.ibiblio.org/gentoo/distfiles/vimpatch-1-142.tar.bz2"
+elif [ "$vim_pre" -lt 27 ]; then
+	# Handle (prerelease) versions with one trailing letter
+	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
+	S="$WORKDIR/vim${vim_version//.}$vim_letters"
+	A="vim-$vim_version$vim_letters.tar.bz2"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
+			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
+			 http://www.ibiblio.org/gentoo/distfiles/vimpatch-1-142.tar.bz2"
+
+elif [ "$vim_pre" -lt 703 ]; then
+	# Handle (prerelease) versions with two trailing letters
+	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
+	S="$WORKDIR/vim${vim_version//.}$vim_letters"
+	A="vim-$vim_version$vim_letters.tar.bz2"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
+			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
+			 http://www.ibiblio.org/gentoo/distfiles/vimpatch-1-142.tar.bz2"
+else
+	die "Eek!  I don't know how to interpret the version!"
+fi
+
+DESCRIPTION="Vi IMproved!"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+KEYWORDS="x86 ppc"
+
+DEPEND="dev-util/cscope
+	>=sys-libs/ncurses-5.2-r2
+	gpm?	( >=sys-libs/gpm-1.19.3 )
+	gnome?	( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	gtk?	( =x11-libs/gtk+-1.2* )
+	X?		( x11-base/xfree )
+	perl?	( sys-devel/perl )
+	python? ( dev-lang/python )
+	ruby?	( >=dev-lang/ruby-1.6.4 )"
+#	tcltk?	( dev-lang/tcl )"
+# It appears that the tclinterp stuff in Vim is broken right now (at
+# least on Linux... it works on BSD).  When you --enable-tclinterp
+# flag, then the following command never returns:
+#
+#   VIMINIT='let OS = system("uname -s")' vim
+#
+# Please don't re-enable the tclinterp flag without verifying first
+# that the above works.  Thanks.  (08 Sep 2001 agriffis)
+
+
+src_unpack() {
+	unpack $A
+	# Fixup a script to use awk instead of nawk
+	cd $S/runtime/tools
+	mv mve.awk mve.awk.old
+	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
+	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
+	cd ${WORKDIR}
+	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
+	cd $S
+	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
+	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
+	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
+	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
+	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
+	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
+	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
+			
+	cd ${WORKDIR}
+	tar xvjf ${DISTDIR}/vimpatch-1-142.tar.bz2
+	cd $S
+	
+	# Apply any patches available for this version
+	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
+	case "$patches" in
+		*\]) 
+			;; # globbing didn't work; no patches available
+		*)
+			cd $S
+			for a in $patches; do
+				patch -p0 < $a
+			done
+			;;
+	esac
+	
+	# rphillips at gentoo.org
+	# latest patches do not compile. Here is a fix
+	patch -p0 < ${FILESDIR}/rphillips-invalcolorpatch.diff
+	
+	# Also apply the ebuild syntax patch, until this is in Vim proper
+	cd $S/runtime
+	patch -f -p0 < ${FILESDIR}/ebuild.patch
+
+}
+
+src_compile() {
+
+	local myconf
+	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
+	use perl   && myconf="$myconf --enable-perlinterp"
+	use python && myconf="$myconf --enable-pythoninterp"
+	use ruby   && myconf="$myconf --enable-rubyinterp"
+	
+# tclinterp is BROKEN.  See note above DEPEND=
+#	use tcltk  && myconf="$myconf --enable-tclinterp"
+
+# Added back gpm for temporary will remove if necessary, I think that I have
+# fixed most of gpm so it should be fine.
+	use gpm    || myconf="$myconf --disable-gpm"
+
+	#
+	# First, build a gui version, this will install as /usr/bin/gvim
+	#
+	if use gnome; then
+		guiconf="--enable-gui=gnome --with-x"
+	elif use gtk; then
+		guiconf="--enable-gui=gtk --with-x"
+	elif use X; then
+		guiconf="--enable-gui=athena --with-x"
+	else
+		# No gui version will be built
+		guiconf=""
+	fi
+	
+	# This should fix a sandbox violation. 
+	addwrite /dev/pty/*
+	
+	if [ -n "$guiconf" ]; then
+		./configure \
+			--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
+			--with-features=huge --enable-cscope $myconf $guiconf \
+			|| die "gvim configure failed"
+		# Parallel make does not work
+		make || die "gvim make failed"
+		mv src/vim src/gvim
+	fi
+
+	#
+	# Second, build a nogui version, this will install as /usr/bin/vim
+	#
+	./configure \
+		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
+		--with-features=huge --with-cscope $myconf \
+		--enable-gui=no --without-x \
+		|| die "vim configure failed"
+	# Parallel make does not work
+	make || die "vim make failed"
+}
+
+src_install() {
+	# Install the nogui version
+	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
+	make install STRIP=true DESTDIR=$D \
+		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
+	# Install the gui version, if it was built
+	if [ -f src/gvim ]; then
+		install -m755 src/gvim $D/usr/bin/gvim
+		ln -s gvim $D/usr/bin/gvimdiff
+	fi
+	# Docs
+	dodoc README*
+	cd $D/usr/share/doc/$PF
+	ln -s ../../vim/*/doc $P
+	# Default vimrc and gvimrc (who cares if gvim wasn't built)
+	insinto /usr/share/vim
+	doins ${FILESDIR}/vimrc ${FILESDIR}/gvimrc
+
+	#fix problems with vim not finding its data files.
+	dodir /etc/env.d
+	echo "VIMRUNTIME=/usr/share/vim/vim${vim_version/.}" \
+		>${D}/etc/env.d/40vim
+}