Updated vim to 6.0.220

* created a new jumbo patch which includes some of the previously ignored
  patches (those which applied only partially)

* changes since 6.0.185

  * compiler warnings in the X11 client-server code
  * "I" in Visual mode saves too many lines for undo
  * size of Visual area not shown after scrolling
  * GUI: when 'mouse' is empty middle click still moved the cursor
  * serverlist() gives an error when there is no server
  * when 'virtualedit' is set "ylj" goes to the wrong column
  * col(".") returns one to little when 'virtualedit' is set
  * "--remote-silent" partly worked like "--remote-wait"
  * when 'virtualedit' is set search() may find wrong position
  * 've' set and 'sel' "exclusive" "x" in Visual mode works wrong
  * 've' set and 'sel' "exclusive" "v$x" doesn't delete last char
  * cursor doesn't move correctly when 've' and 'showbreak' set
  * multi-byte: could crash on exit when 'tenc' is set.
  * a script starting with "#!perl" is not recognized as perl
  * when scrollbinding a long jump doesn't set cursor properly
  * GTK: "icon=" argument for toolbar item was not used
  * setting 'fileformat' was possible when 'modifiable' is off
  * ":unlet" doesn't work for variables with curly braces
  * (extra) batch scripts to start gvim didn't use -f argument
  * expanding wildcards or avoiding it doesn't work properly
  * (extra) installed shortcuts start in desktop directory
  * cursor color not updated for CTRL-^ in Insert mode
  * GUI: redraw problems with bold multi-byte characters
  * after 6.0.167: allow "++enc" to overrule help file encoding
  * set 'readonly' after reading a file failed
  * GTK: missing button names for confirm() causes a crash
  * display problems for unprintable file name chars with CTRL-G
  * viminfo files contains marks without a file name
  * copy and paste doesn't work when using "/" in Visual mode
  * may display wrong lines after reloading a changed file
  * ":help" may leave an empty unlisted buffer behind
  * explorer plugin only loads directory in first window
  * ":setlocal" and ":setglobal" list termcap options
  * patch 6.0.218 causes a beep on startup

2 files changed, 7 insertions, 123 deletions

diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 41c16a8f9e9..0972acb2e1c 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.25 2002/02/05 13:00:43 martti Exp $
+# $NetBSD: Makefile.common,v 1.26 2002/02/12 09:24:38 martti Exp $
 
-VIM_VERSION=		6.0.185
+VIM_VERSION=		6.0.220
 DISTNAME=		vim-${VIM_VERSION:C/\.[0-9]*$//}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
@@ -10,28 +10,10 @@ DIST_SUBDIR=		vim
 EXTRACT_SUFX=		.tar.bz2
 
 #
-# Following patches were ignored:
-# 121, 122, 123, 125, 135, 137, 138, 144, 147, 152, 161, 162, 164, 165, 179,
-# 181
-#
-PATCH_SITES+=		${MASTER_SITES:S/unix/patches/}
-.for p in		124 126 127 128 129 130 \
-			131 132 133 134 136 139 140 \
-			141 142 143 145 146 148 149 150 \
-			151 153 154 155 156 157 158 159 160 \
-			163 166 167 168 169 170 \
-			171 172 173 174 175 176 177 178 180 \
-			182 183 184 185
-PATCHFILES+=		${VIM_VERSION:C/\.[0-9]*$//}.${p}
-.endfor
-
-#
-# Combine the first 120 patches into one big patch
-#
-# Ignored: 12, 27, 48, 53, 64, 70, 73, 87, 93, 106, 107, 115, 116, 117, 119
+# Combine the first 220 patches into one big patch
 #
 PATCH_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
-PATCHFILES+=		vim-6.0-001-120.diff.gz
+PATCHFILES+=		vim-6.0-001-220.diff.gz
 
 MAINTAINER=		martti@netbsd.org
 HOMEPAGE=		http://www.vim.org/
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index aa1c6125b67..7539ca94a89 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,107 +1,9 @@
-$NetBSD: distinfo,v 1.22 2002/02/05 13:00:43 martti Exp $
+$NetBSD: distinfo,v 1.23 2002/02/12 09:24:39 martti Exp $
 
 SHA1 (vim/vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
 Size (vim/vim-6.0.tar.bz2) = 2776551 bytes
-SHA1 (vim/6.0.124) = ff35dc1759e10c817bfad104bd738193c5dba0b0
-Size (vim/6.0.124) = 4909 bytes
-SHA1 (vim/6.0.126) = 7b5ec46b2d107252865716a2d42d1f08a54763d5
-Size (vim/6.0.126) = 3303 bytes
-SHA1 (vim/6.0.127) = eebed8bd9690f814af54258c0c029ae1fb463a5d
-Size (vim/6.0.127) = 1517 bytes
-SHA1 (vim/6.0.128) = c6ab766a82e5010b4fc06447485cf9799479080f
-Size (vim/6.0.128) = 1807 bytes
-SHA1 (vim/6.0.129) = 4a89fad6b25ce989a35b4edf809b25bac61f49a8
-Size (vim/6.0.129) = 1458 bytes
-SHA1 (vim/6.0.130) = eff55eb2d88bd0566fedb0ca29c2b29fbe887d39
-Size (vim/6.0.130) = 1556 bytes
-SHA1 (vim/6.0.131) = 7e80c88729d9daddaf73db7ad2ea58d67c9a555e
-Size (vim/6.0.131) = 4339 bytes
-SHA1 (vim/6.0.132) = b4f6cffd7c30463356d0498f3ab666a1be5e43ac
-Size (vim/6.0.132) = 1785 bytes
-SHA1 (vim/6.0.133) = 48d8de58158f4f8713ca87256a1ace24c1c64d57
-Size (vim/6.0.133) = 2620 bytes
-SHA1 (vim/6.0.134) = dd648a53f546186ed3a4536f859ea0f1f494c62d
-Size (vim/6.0.134) = 7988 bytes
-SHA1 (vim/6.0.136) = b97df3f5d01d6afdcc3ad83a7f733eba0d84294b
-Size (vim/6.0.136) = 1382 bytes
-SHA1 (vim/6.0.139) = a620577defa499c19b9290d6a26b26ac800bf43d
-Size (vim/6.0.139) = 3171 bytes
-SHA1 (vim/6.0.140) = e27f22892bc34e209224c5e38d452717e6986829
-Size (vim/6.0.140) = 4881 bytes
-SHA1 (vim/6.0.141) = edbd992ffb43969b1cd2fbc838be84b4d88e8596
-Size (vim/6.0.141) = 4726 bytes
-SHA1 (vim/6.0.142) = 66b26d04c49dbea7a35a6ec0d3b1d95b85213209
-Size (vim/6.0.142) = 3470 bytes
-SHA1 (vim/6.0.143) = 4358138f9189e82fd74f30f0b2cfebc8b2bfc004
-Size (vim/6.0.143) = 10224 bytes
-SHA1 (vim/6.0.145) = 3e640cdecf53e1299d8e97337c27343acdaee511
-Size (vim/6.0.145) = 2097 bytes
-SHA1 (vim/6.0.146) = 2d0f0720e60ee21249fa07bb8ad74b6e0daa2341
-Size (vim/6.0.146) = 1488 bytes
-SHA1 (vim/6.0.148) = deef56e2e87b96f3d69bc05e300ea6acdd30d5c1
-Size (vim/6.0.148) = 2909 bytes
-SHA1 (vim/6.0.149) = a7d6343b2146f4dc910da5cb22740c19a734e3f1
-Size (vim/6.0.149) = 2932 bytes
-SHA1 (vim/6.0.150) = fec9fc8c764ae545804795b1f41810b305546847
-Size (vim/6.0.150) = 2051 bytes
-SHA1 (vim/6.0.151) = 7062e774ebd7523e0aeaa86704d550d70486574a
-Size (vim/6.0.151) = 2621 bytes
-SHA1 (vim/6.0.153) = db4afa7ba8ee8e4a5872170fe8f71195d0e5098a
-Size (vim/6.0.153) = 2016 bytes
-SHA1 (vim/6.0.154) = 76e2edc294647d5fca3b2f2cc7ff77b6fda32c97
-Size (vim/6.0.154) = 2479 bytes
-SHA1 (vim/6.0.155) = 14b125761fbbe591467163b3b29f594b8505ab69
-Size (vim/6.0.155) = 1271 bytes
-SHA1 (vim/6.0.156) = d2301aa3c085352b03a53d9b59d52fe2ab5aa9b0
-Size (vim/6.0.156) = 1438 bytes
-SHA1 (vim/6.0.157) = d00878f59747cdeaa9a83407691bdc1c012499b1
-Size (vim/6.0.157) = 2543 bytes
-SHA1 (vim/6.0.158) = d1545a0cdc1b9cebc733e0eff58ceb395bba582a
-Size (vim/6.0.158) = 1880 bytes
-SHA1 (vim/6.0.159) = e1b4a5590b003ae58b6d9ac472017efce4f8bab7
-Size (vim/6.0.159) = 5247 bytes
-SHA1 (vim/6.0.160) = e4e2401c20b90b40a6710adcabd40c0e383d844b
-Size (vim/6.0.160) = 2356 bytes
-SHA1 (vim/6.0.163) = 029124b537ad1bc94907ffb6f76d589782d40b5c
-Size (vim/6.0.163) = 14280 bytes
-SHA1 (vim/6.0.166) = b28593c0105a858224480cf7ecc707614d801399
-Size (vim/6.0.166) = 3256 bytes
-SHA1 (vim/6.0.167) = eb9ca274f429188c355dbcd18b425ac913c9bef0
-Size (vim/6.0.167) = 1627 bytes
-SHA1 (vim/6.0.168) = b9d7417a2e6df8dd54a39b9668df134eac78cfc4
-Size (vim/6.0.168) = 2019 bytes
-SHA1 (vim/6.0.169) = 992bc90b811624822fb19eb72e6f92fe240afc97
-Size (vim/6.0.169) = 1819 bytes
-SHA1 (vim/6.0.170) = 20e58e3e1dbd3a00fa5d71e50505d1133bf0aed6
-Size (vim/6.0.170) = 1526 bytes
-SHA1 (vim/6.0.171) = 9a5dfd02792388a0e671bb5599a19c41717f9836
-Size (vim/6.0.171) = 2259 bytes
-SHA1 (vim/6.0.172) = 1ee87ec37342d7302fd793ea06a4d53378d7fff1
-Size (vim/6.0.172) = 2956 bytes
-SHA1 (vim/6.0.173) = fbb825bf2de4d78ef0285332653cce44c1f2bea5
-Size (vim/6.0.173) = 1550 bytes
-SHA1 (vim/6.0.174) = c2b31f8b3c954fba6c4745cea03191f0ab430291
-Size (vim/6.0.174) = 2421 bytes
-SHA1 (vim/6.0.175) = 03ab4f17af0b543af5c6106d3026bbfb5abe3027
-Size (vim/6.0.175) = 2347 bytes
-SHA1 (vim/6.0.176) = 15f12b782b2a632bc2fc62dc3d7f4be7664cea94
-Size (vim/6.0.176) = 2581 bytes
-SHA1 (vim/6.0.177) = bcfcb0974b11bbb9be2cb7c054f9815bc6d34c65
-Size (vim/6.0.177) = 3636 bytes
-SHA1 (vim/6.0.178) = b47a7ceafd982cca5ae93dbcce48bf65e2a61881
-Size (vim/6.0.178) = 4087 bytes
-SHA1 (vim/6.0.180) = f76667999c748573f705cbc29560de4ba3a43c83
-Size (vim/6.0.180) = 1501 bytes
-SHA1 (vim/6.0.182) = 3d18d2478fa51977367511a6f1f99c03994c24a5
-Size (vim/6.0.182) = 1622 bytes
-SHA1 (vim/6.0.183) = 4efaf96ea4b68f965bcc5ef59b5817a77385a024
-Size (vim/6.0.183) = 1303 bytes
-SHA1 (vim/6.0.184) = 962b747c72811df13c2a1fa51c08d57db77078ae
-Size (vim/6.0.184) = 2948 bytes
-SHA1 (vim/6.0.185) = 2aa95cfc4463b2877af59eed7a16d546108e0212
-Size (vim/6.0.185) = 1541 bytes
-SHA1 (vim/vim-6.0-001-120.diff.gz) = dc096c4d9454d73a236eccd11caf0dc4f78d38e7
-Size (vim/vim-6.0-001-120.diff.gz) = 36179 bytes
+SHA1 (vim/vim-6.0-001-220.diff.gz) = 0adb64cd9cb4e87b3ec2082285d18b427c612ee1
+Size (vim/vim-6.0-001-220.diff.gz) = 101670 bytes
 SHA1 (patch-aa) = 8176260aff9176f350c4534f52bce0080fedd28b
 SHA1 (patch-ad) = 34e1420b7cbf25fb0394a36c32faf2e03c54b386
 SHA1 (patch-zb) = 41f58d90a14f47b0bf242bb90178f0c872e4b022