Updated vim to 6.3

This is a bugfix release of Vim. Since Vim 6.2 hundreds of reported
problems have been fixed. Also included are new and updated syntax
files, translated menus and messages.

6 files changed, 109 insertions, 26 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 04502e4dc41..6f7dae3ae48 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 07:27:25 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/06/21 08:23:48 martti Exp $
 
 .include		"Makefile.common"
 
@@ -10,7 +10,7 @@ CONFIGURE_ARGS+=	--disable-gui
 
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
 
-PLIST_SUBST+=		VIM_SUBDIR="vim62"
+PLIST_SUBST+=		VIM_SUBDIR="vim63"
 
 do-build:
 	@cd ${WRKSRC}/xxd && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 31ac71925aa..6a0ed0e94b9 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.36 2004/04/25 01:46:11 snj Exp $
+# $NetBSD: Makefile.common,v 1.37 2004/06/21 08:23:48 martti Exp $
 
-VIM_VERSION=		6.2
+VIM_VERSION=		6.3
 VIM_PATCHLEVEL=		0
 DISTNAME=		vim-${VIM_VERSION}
 CATEGORIES=		editors
@@ -22,7 +22,7 @@ HOMEPAGE=		http://www.vim.org/
 
 CONFLICTS+=		vim-kde-[0-9]*
 
-WRKSRC=			${WRKDIR}/vim62/src
+WRKSRC=			${WRKDIR}/vim63/src
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
@@ -30,9 +30,9 @@ GNU_CONFIGURE=		yes
 # files (and PLIST might not include all files) so use at your own risk!
 CONFIGURE_ARGS+=	${VIM_EXTRA_OPTS}
 
-PATCH_ARGS=		-d ${WRKDIR}/vim62 --forward --quiet \
+PATCH_ARGS=		-d ${WRKDIR}/vim63 --forward --quiet \
 				-E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR}/vim62 --forward --quiet \
+PATCH_DIST_ARGS=	-d ${WRKDIR}/vim63 --forward --quiet \
 				-E ${PATCH_DIST_STRIP}
 PATCHDIR?=		${.CURDIR}/../vim-share/patches
 DISTINFO_FILE?=		${.CURDIR}/../vim-share/distinfo
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 528683464f2..ee3f0f53673 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/02 07:27:26 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/21 08:23:48 martti Exp $
 bin/vimtutor
 bin/xxd
 man/man1/evim.1
@@ -11,6 +11,7 @@ share/vim/${VIM_SUBDIR}/colors/README.txt
 share/vim/${VIM_SUBDIR}/colors/blue.vim
 share/vim/${VIM_SUBDIR}/colors/darkblue.vim
 share/vim/${VIM_SUBDIR}/colors/default.vim
+share/vim/${VIM_SUBDIR}/colors/delek.vim
 share/vim/${VIM_SUBDIR}/colors/desert.vim
 share/vim/${VIM_SUBDIR}/colors/elflord.vim
 share/vim/${VIM_SUBDIR}/colors/evening.vim
@@ -26,28 +27,41 @@ share/vim/${VIM_SUBDIR}/colors/zellner.vim
 share/vim/${VIM_SUBDIR}/compiler/README.txt
 share/vim/${VIM_SUBDIR}/compiler/ant.vim
 share/vim/${VIM_SUBDIR}/compiler/bcc.vim
+share/vim/${VIM_SUBDIR}/compiler/bdf.vim
 share/vim/${VIM_SUBDIR}/compiler/checkstyle.vim
 share/vim/${VIM_SUBDIR}/compiler/cs.vim
+share/vim/${VIM_SUBDIR}/compiler/dot.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_F.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_cv.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_elf90.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_g77.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_lf95.vim
 share/vim/${VIM_SUBDIR}/compiler/hp_acc.vim
+share/vim/${VIM_SUBDIR}/compiler/icc.vim
+share/vim/${VIM_SUBDIR}/compiler/intel.vim
 share/vim/${VIM_SUBDIR}/compiler/irix5_c.vim
 share/vim/${VIM_SUBDIR}/compiler/irix5_cpp.vim
+share/vim/${VIM_SUBDIR}/compiler/javac.vim
 share/vim/${VIM_SUBDIR}/compiler/jikes.vim
 share/vim/${VIM_SUBDIR}/compiler/mips_c.vim
 share/vim/${VIM_SUBDIR}/compiler/mipspro_c89.vim
 share/vim/${VIM_SUBDIR}/compiler/mipspro_cpp.vim
 share/vim/${VIM_SUBDIR}/compiler/modelsim_vcom.vim
 share/vim/${VIM_SUBDIR}/compiler/msvc.vim
+share/vim/${VIM_SUBDIR}/compiler/neato.vim
+share/vim/${VIM_SUBDIR}/compiler/onsgmls.vim
+share/vim/${VIM_SUBDIR}/compiler/pbx.vim
+share/vim/${VIM_SUBDIR}/compiler/perl.vim
 share/vim/${VIM_SUBDIR}/compiler/pyunit.vim
+share/vim/${VIM_SUBDIR}/compiler/rst.vim
 share/vim/${VIM_SUBDIR}/compiler/ruby.vim
+share/vim/${VIM_SUBDIR}/compiler/se.vim
 share/vim/${VIM_SUBDIR}/compiler/splint.vim
+share/vim/${VIM_SUBDIR}/compiler/tcl.vim
 share/vim/${VIM_SUBDIR}/compiler/tex.vim
 share/vim/${VIM_SUBDIR}/compiler/tidy.vim
 share/vim/${VIM_SUBDIR}/compiler/xmllint.vim
+share/vim/${VIM_SUBDIR}/compiler/xmlwf.vim
 share/vim/${VIM_SUBDIR}/delmenu.vim
 share/vim/${VIM_SUBDIR}/doc/arabic.txt
 share/vim/${VIM_SUBDIR}/doc/autocmd.txt
@@ -113,8 +127,10 @@ share/vim/${VIM_SUBDIR}/doc/recover.txt
 share/vim/${VIM_SUBDIR}/doc/remote.txt
 share/vim/${VIM_SUBDIR}/doc/repeat.txt
 share/vim/${VIM_SUBDIR}/doc/rileft.txt
+share/vim/${VIM_SUBDIR}/doc/russian.txt
 share/vim/${VIM_SUBDIR}/doc/scroll.txt
 share/vim/${VIM_SUBDIR}/doc/sign.txt
+share/vim/${VIM_SUBDIR}/doc/sponsor.txt
 share/vim/${VIM_SUBDIR}/doc/starting.txt
 share/vim/${VIM_SUBDIR}/doc/syntax.txt
 share/vim/${VIM_SUBDIR}/doc/tags
@@ -170,6 +186,7 @@ share/vim/${VIM_SUBDIR}/filetype.vim
 share/vim/${VIM_SUBDIR}/ftoff.vim
 share/vim/${VIM_SUBDIR}/ftplugin.vim
 share/vim/${VIM_SUBDIR}/ftplugin/README.txt
+share/vim/${VIM_SUBDIR}/ftplugin/aap.vim
 share/vim/${VIM_SUBDIR}/ftplugin/abaqus.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ada.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ant.vim
@@ -178,12 +195,14 @@ share/vim/${VIM_SUBDIR}/ftplugin/aspvbs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/automake.vim
 share/vim/${VIM_SUBDIR}/ftplugin/bib.vim
 share/vim/${VIM_SUBDIR}/ftplugin/c.vim
+share/vim/${VIM_SUBDIR}/ftplugin/ch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/changelog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/config.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cpp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/csc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/csh.vim
+share/vim/${VIM_SUBDIR}/ftplugin/css.vim
 share/vim/${VIM_SUBDIR}/ftplugin/debchangelog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosbatch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dtd.vim
@@ -208,8 +227,10 @@ share/vim/${VIM_SUBDIR}/ftplugin/pascal.vim
 share/vim/${VIM_SUBDIR}/ftplugin/perl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/php.vim
 share/vim/${VIM_SUBDIR}/ftplugin/postscr.vim
+share/vim/${VIM_SUBDIR}/ftplugin/pyrex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/python.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rpl.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rst.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/scheme.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sgml.vim
@@ -231,16 +252,19 @@ share/vim/${VIM_SUBDIR}/ftplugof.vim
 share/vim/${VIM_SUBDIR}/gvimrc_example.vim
 share/vim/${VIM_SUBDIR}/indent.vim
 share/vim/${VIM_SUBDIR}/indent/README.txt
+share/vim/${VIM_SUBDIR}/indent/aap.vim
 share/vim/${VIM_SUBDIR}/indent/ada.vim
 share/vim/${VIM_SUBDIR}/indent/ant.vim
 share/vim/${VIM_SUBDIR}/indent/automake.vim
 share/vim/${VIM_SUBDIR}/indent/awk.vim
 share/vim/${VIM_SUBDIR}/indent/c.vim
 share/vim/${VIM_SUBDIR}/indent/cdl.vim
+share/vim/${VIM_SUBDIR}/indent/ch.vim
 share/vim/${VIM_SUBDIR}/indent/config.vim
 share/vim/${VIM_SUBDIR}/indent/cpp.vim
 share/vim/${VIM_SUBDIR}/indent/cs.vim
 share/vim/${VIM_SUBDIR}/indent/css.vim
+share/vim/${VIM_SUBDIR}/indent/docbk.vim
 share/vim/${VIM_SUBDIR}/indent/dylan.vim
 share/vim/${VIM_SUBDIR}/indent/eiffel.vim
 share/vim/${VIM_SUBDIR}/indent/eterm.vim
@@ -252,6 +276,8 @@ share/vim/${VIM_SUBDIR}/indent/java.vim
 share/vim/${VIM_SUBDIR}/indent/lua.vim
 share/vim/${VIM_SUBDIR}/indent/make.vim
 share/vim/${VIM_SUBDIR}/indent/matlab.vim
+share/vim/${VIM_SUBDIR}/indent/mp.vim
+share/vim/${VIM_SUBDIR}/indent/objc.vim
 share/vim/${VIM_SUBDIR}/indent/ocaml.vim
 share/vim/${VIM_SUBDIR}/indent/occam.vim
 share/vim/${VIM_SUBDIR}/indent/perl.vim
@@ -259,21 +285,26 @@ share/vim/${VIM_SUBDIR}/indent/php.vim
 share/vim/${VIM_SUBDIR}/indent/postscr.vim
 share/vim/${VIM_SUBDIR}/indent/pov.vim
 share/vim/${VIM_SUBDIR}/indent/prolog.vim
+share/vim/${VIM_SUBDIR}/indent/pyrex.vim
 share/vim/${VIM_SUBDIR}/indent/python.vim
 share/vim/${VIM_SUBDIR}/indent/readline.vim
 share/vim/${VIM_SUBDIR}/indent/rpl.vim
+share/vim/${VIM_SUBDIR}/indent/rst.vim
 share/vim/${VIM_SUBDIR}/indent/ruby.vim
 share/vim/${VIM_SUBDIR}/indent/sdl.vim
 share/vim/${VIM_SUBDIR}/indent/sh.vim
 share/vim/${VIM_SUBDIR}/indent/tcl.vim
+share/vim/${VIM_SUBDIR}/indent/tcsh.vim
 share/vim/${VIM_SUBDIR}/indent/tilde.vim
 share/vim/${VIM_SUBDIR}/indent/vb.vim
 share/vim/${VIM_SUBDIR}/indent/verilog.vim
 share/vim/${VIM_SUBDIR}/indent/vim.vim
+share/vim/${VIM_SUBDIR}/indent/xf86conf.vim
 share/vim/${VIM_SUBDIR}/indent/xhtml.vim
 share/vim/${VIM_SUBDIR}/indent/xml.vim
 share/vim/${VIM_SUBDIR}/indent/xslt.vim
 share/vim/${VIM_SUBDIR}/indent/yacc.vim
+share/vim/${VIM_SUBDIR}/indent/zsh.vim
 share/vim/${VIM_SUBDIR}/indoff.vim
 share/vim/${VIM_SUBDIR}/macros/README.txt
 share/vim/${VIM_SUBDIR}/macros/dvorak
@@ -289,10 +320,12 @@ share/vim/${VIM_SUBDIR}/macros/matchit.txt
 share/vim/${VIM_SUBDIR}/macros/matchit.vim
 share/vim/${VIM_SUBDIR}/macros/maze/Makefile
 share/vim/${VIM_SUBDIR}/macros/maze/README.txt
+share/vim/${VIM_SUBDIR}/macros/maze/main.aap
 share/vim/${VIM_SUBDIR}/macros/maze/maze.c
 share/vim/${VIM_SUBDIR}/macros/maze/maze_5.78
 share/vim/${VIM_SUBDIR}/macros/maze/maze_mac
 share/vim/${VIM_SUBDIR}/macros/maze/mazeansi.c
+share/vim/${VIM_SUBDIR}/macros/maze/mazeclean.c
 share/vim/${VIM_SUBDIR}/macros/maze/poster
 share/vim/${VIM_SUBDIR}/macros/shellmenu.vim
 share/vim/${VIM_SUBDIR}/macros/swapmous.vim
@@ -356,6 +389,7 @@ share/vim/${VIM_SUBDIR}/syntax/ant.vim
 share/vim/${VIM_SUBDIR}/syntax/antlr.vim
 share/vim/${VIM_SUBDIR}/syntax/apache.vim
 share/vim/${VIM_SUBDIR}/syntax/apachestyle.vim
+share/vim/${VIM_SUBDIR}/syntax/arch.vim
 share/vim/${VIM_SUBDIR}/syntax/art.vim
 share/vim/${VIM_SUBDIR}/syntax/asm.vim
 share/vim/${VIM_SUBDIR}/syntax/asm68k.vim
@@ -378,6 +412,7 @@ share/vim/${VIM_SUBDIR}/syntax/bindzone.vim
 share/vim/${VIM_SUBDIR}/syntax/blank.vim
 share/vim/${VIM_SUBDIR}/syntax/btm.vim
 share/vim/${VIM_SUBDIR}/syntax/c.vim
+share/vim/${VIM_SUBDIR}/syntax/calendar.vim
 share/vim/${VIM_SUBDIR}/syntax/catalog.vim
 share/vim/${VIM_SUBDIR}/syntax/cdl.vim
 share/vim/${VIM_SUBDIR}/syntax/cf.vim
@@ -387,6 +422,7 @@ share/vim/${VIM_SUBDIR}/syntax/change.vim
 share/vim/${VIM_SUBDIR}/syntax/changelog.vim
 share/vim/${VIM_SUBDIR}/syntax/chaskell.vim
 share/vim/${VIM_SUBDIR}/syntax/cheetah.vim
+share/vim/${VIM_SUBDIR}/syntax/chill.vim
 share/vim/${VIM_SUBDIR}/syntax/cl.vim
 share/vim/${VIM_SUBDIR}/syntax/clean.vim
 share/vim/${VIM_SUBDIR}/syntax/clipper.vim
@@ -395,6 +431,7 @@ share/vim/${VIM_SUBDIR}/syntax/colortest.vim
 share/vim/${VIM_SUBDIR}/syntax/conf.vim
 share/vim/${VIM_SUBDIR}/syntax/config.vim
 share/vim/${VIM_SUBDIR}/syntax/cpp.vim
+share/vim/${VIM_SUBDIR}/syntax/crm.vim
 share/vim/${VIM_SUBDIR}/syntax/crontab.vim
 share/vim/${VIM_SUBDIR}/syntax/cs.vim
 share/vim/${VIM_SUBDIR}/syntax/csc.vim
@@ -410,13 +447,16 @@ share/vim/${VIM_SUBDIR}/syntax/cvsrc.vim
 share/vim/${VIM_SUBDIR}/syntax/cweb.vim
 share/vim/${VIM_SUBDIR}/syntax/cynlib.vim
 share/vim/${VIM_SUBDIR}/syntax/cynpp.vim
+share/vim/${VIM_SUBDIR}/syntax/d.vim
 share/vim/${VIM_SUBDIR}/syntax/dcd.vim
 share/vim/${VIM_SUBDIR}/syntax/dcl.vim
 share/vim/${VIM_SUBDIR}/syntax/debchangelog.vim
 share/vim/${VIM_SUBDIR}/syntax/debcontrol.vim
 share/vim/${VIM_SUBDIR}/syntax/def.vim
 share/vim/${VIM_SUBDIR}/syntax/desc.vim
+share/vim/${VIM_SUBDIR}/syntax/desktop.vim
 share/vim/${VIM_SUBDIR}/syntax/diff.vim
+share/vim/${VIM_SUBDIR}/syntax/dircolors.vim
 share/vim/${VIM_SUBDIR}/syntax/diva.vim
 share/vim/${VIM_SUBDIR}/syntax/dns.vim
 share/vim/${VIM_SUBDIR}/syntax/docbk.vim
@@ -436,6 +476,7 @@ share/vim/${VIM_SUBDIR}/syntax/ecd.vim
 share/vim/${VIM_SUBDIR}/syntax/edif.vim
 share/vim/${VIM_SUBDIR}/syntax/eiffel.vim
 share/vim/${VIM_SUBDIR}/syntax/elf.vim
+share/vim/${VIM_SUBDIR}/syntax/elinks.vim
 share/vim/${VIM_SUBDIR}/syntax/elmfilt.vim
 share/vim/${VIM_SUBDIR}/syntax/erlang.vim
 share/vim/${VIM_SUBDIR}/syntax/esqlc.vim
@@ -443,6 +484,8 @@ share/vim/${VIM_SUBDIR}/syntax/eterm.vim
 share/vim/${VIM_SUBDIR}/syntax/exim.vim
 share/vim/${VIM_SUBDIR}/syntax/expect.vim
 share/vim/${VIM_SUBDIR}/syntax/exports.vim
+share/vim/${VIM_SUBDIR}/syntax/fasm.vim
+share/vim/${VIM_SUBDIR}/syntax/fdcc.vim
 share/vim/${VIM_SUBDIR}/syntax/fetchmail.vim
 share/vim/${VIM_SUBDIR}/syntax/fgl.vim
 share/vim/${VIM_SUBDIR}/syntax/focexec.vim
@@ -460,6 +503,7 @@ share/vim/${VIM_SUBDIR}/syntax/gkrellmrc.vim
 share/vim/${VIM_SUBDIR}/syntax/gnuplot.vim
 share/vim/${VIM_SUBDIR}/syntax/gp.vim
 share/vim/${VIM_SUBDIR}/syntax/gpg.vim
+share/vim/${VIM_SUBDIR}/syntax/grads.vim
 share/vim/${VIM_SUBDIR}/syntax/groff.vim
 share/vim/${VIM_SUBDIR}/syntax/grub.vim
 share/vim/${VIM_SUBDIR}/syntax/gsp.vim
@@ -476,6 +520,7 @@ share/vim/${VIM_SUBDIR}/syntax/htmlcheetah.vim
 share/vim/${VIM_SUBDIR}/syntax/htmlm4.vim
 share/vim/${VIM_SUBDIR}/syntax/htmlos.vim
 share/vim/${VIM_SUBDIR}/syntax/ia64.vim
+share/vim/${VIM_SUBDIR}/syntax/icemenu.vim
 share/vim/${VIM_SUBDIR}/syntax/icon.vim
 share/vim/${VIM_SUBDIR}/syntax/idl.vim
 share/vim/${VIM_SUBDIR}/syntax/idlang.vim
@@ -501,9 +546,11 @@ share/vim/${VIM_SUBDIR}/syntax/kscript.vim
 share/vim/${VIM_SUBDIR}/syntax/kwt.vim
 share/vim/${VIM_SUBDIR}/syntax/lace.vim
 share/vim/${VIM_SUBDIR}/syntax/latte.vim
+share/vim/${VIM_SUBDIR}/syntax/ldif.vim
 share/vim/${VIM_SUBDIR}/syntax/lex.vim
 share/vim/${VIM_SUBDIR}/syntax/lftp.vim
 share/vim/${VIM_SUBDIR}/syntax/lhaskell.vim
+share/vim/${VIM_SUBDIR}/syntax/libao.vim
 share/vim/${VIM_SUBDIR}/syntax/lifelines.vim
 share/vim/${VIM_SUBDIR}/syntax/lilo.vim
 share/vim/${VIM_SUBDIR}/syntax/lisp.vim
@@ -542,6 +589,7 @@ share/vim/${VIM_SUBDIR}/syntax/modula3.vim
 share/vim/${VIM_SUBDIR}/syntax/monk.vim
 share/vim/${VIM_SUBDIR}/syntax/moo.vim
 share/vim/${VIM_SUBDIR}/syntax/mp.vim
+share/vim/${VIM_SUBDIR}/syntax/mplayerconf.vim
 share/vim/${VIM_SUBDIR}/syntax/msidl.vim
 share/vim/${VIM_SUBDIR}/syntax/msql.vim
 share/vim/${VIM_SUBDIR}/syntax/mush.vim
@@ -577,6 +625,7 @@ share/vim/${VIM_SUBDIR}/syntax/pic.vim
 share/vim/${VIM_SUBDIR}/syntax/pike.vim
 share/vim/${VIM_SUBDIR}/syntax/pilrc.vim
 share/vim/${VIM_SUBDIR}/syntax/pine.vim
+share/vim/${VIM_SUBDIR}/syntax/pinfo.vim
 share/vim/${VIM_SUBDIR}/syntax/plm.vim
 share/vim/${VIM_SUBDIR}/syntax/plp.vim
 share/vim/${VIM_SUBDIR}/syntax/plsql.vim
@@ -593,6 +642,7 @@ share/vim/${VIM_SUBDIR}/syntax/prolog.vim
 share/vim/${VIM_SUBDIR}/syntax/psf.vim
 share/vim/${VIM_SUBDIR}/syntax/ptcap.vim
 share/vim/${VIM_SUBDIR}/syntax/purifylog.vim
+share/vim/${VIM_SUBDIR}/syntax/pyrex.vim
 share/vim/${VIM_SUBDIR}/syntax/python.vim
 share/vim/${VIM_SUBDIR}/syntax/qf.vim
 share/vim/${VIM_SUBDIR}/syntax/quake.vim
@@ -609,9 +659,11 @@ share/vim/${VIM_SUBDIR}/syntax/remind.vim
 share/vim/${VIM_SUBDIR}/syntax/resolv.vim
 share/vim/${VIM_SUBDIR}/syntax/rexx.vim
 share/vim/${VIM_SUBDIR}/syntax/rib.vim
+share/vim/${VIM_SUBDIR}/syntax/rnc.vim
 share/vim/${VIM_SUBDIR}/syntax/robots.vim
 share/vim/${VIM_SUBDIR}/syntax/rpcgen.vim
 share/vim/${VIM_SUBDIR}/syntax/rpl.vim
+share/vim/${VIM_SUBDIR}/syntax/rst.vim
 share/vim/${VIM_SUBDIR}/syntax/rtf.vim
 share/vim/${VIM_SUBDIR}/syntax/ruby.vim
 share/vim/${VIM_SUBDIR}/syntax/samba.vim
@@ -635,6 +687,7 @@ share/vim/${VIM_SUBDIR}/syntax/sindaout.vim
 share/vim/${VIM_SUBDIR}/syntax/skill.vim
 share/vim/${VIM_SUBDIR}/syntax/sl.vim
 share/vim/${VIM_SUBDIR}/syntax/slang.vim
+share/vim/${VIM_SUBDIR}/syntax/slice.vim
 share/vim/${VIM_SUBDIR}/syntax/slrnrc.vim
 share/vim/${VIM_SUBDIR}/syntax/slrnsc.vim
 share/vim/${VIM_SUBDIR}/syntax/sm.vim
@@ -673,6 +726,7 @@ share/vim/${VIM_SUBDIR}/syntax/takcmp.vim
 share/vim/${VIM_SUBDIR}/syntax/takout.vim
 share/vim/${VIM_SUBDIR}/syntax/tasm.vim
 share/vim/${VIM_SUBDIR}/syntax/tcl.vim
+share/vim/${VIM_SUBDIR}/syntax/tcsh.vim
 share/vim/${VIM_SUBDIR}/syntax/terminfo.vim
 share/vim/${VIM_SUBDIR}/syntax/tex.vim
 share/vim/${VIM_SUBDIR}/syntax/texinfo.vim
@@ -696,6 +750,7 @@ share/vim/${VIM_SUBDIR}/syntax/vhdl.vim
 share/vim/${VIM_SUBDIR}/syntax/vim.vim
 share/vim/${VIM_SUBDIR}/syntax/viminfo.vim
 share/vim/${VIM_SUBDIR}/syntax/virata.vim
+share/vim/${VIM_SUBDIR}/syntax/vmasm.vim
 share/vim/${VIM_SUBDIR}/syntax/vrml.vim
 share/vim/${VIM_SUBDIR}/syntax/vsejcl.vim
 share/vim/${VIM_SUBDIR}/syntax/wdiff.vim
@@ -721,6 +776,7 @@ share/vim/${VIM_SUBDIR}/syntax/xsd.vim
 share/vim/${VIM_SUBDIR}/syntax/xslt.vim
 share/vim/${VIM_SUBDIR}/syntax/xxd.vim
 share/vim/${VIM_SUBDIR}/syntax/yacc.vim
+share/vim/${VIM_SUBDIR}/syntax/yaml.vim
 share/vim/${VIM_SUBDIR}/syntax/z8a.vim
 share/vim/${VIM_SUBDIR}/syntax/zsh.vim
 share/vim/${VIM_SUBDIR}/tools/README.txt
@@ -739,13 +795,37 @@ share/vim/${VIM_SUBDIR}/tools/shtags.1
 share/vim/${VIM_SUBDIR}/tools/shtags.pl
 share/vim/${VIM_SUBDIR}/tools/tcltags
 share/vim/${VIM_SUBDIR}/tools/vim132
+share/vim/${VIM_SUBDIR}/tools/vim_vs_net.cmd
 share/vim/${VIM_SUBDIR}/tools/vimm
 share/vim/${VIM_SUBDIR}/tools/vimspell.sh
 share/vim/${VIM_SUBDIR}/tools/vimspell.txt
 share/vim/${VIM_SUBDIR}/tools/xcmdsrv_client.c
+share/vim/${VIM_SUBDIR}/tutor/README.gr.cp737.txt
+share/vim/${VIM_SUBDIR}/tutor/README.gr.txt
 share/vim/${VIM_SUBDIR}/tutor/README.txt
 share/vim/${VIM_SUBDIR}/tutor/tutor
+share/vim/${VIM_SUBDIR}/tutor/tutor.ca
+share/vim/${VIM_SUBDIR}/tutor/tutor.de
+share/vim/${VIM_SUBDIR}/tutor/tutor.es
+share/vim/${VIM_SUBDIR}/tutor/tutor.fr
+share/vim/${VIM_SUBDIR}/tutor/tutor.gr
+share/vim/${VIM_SUBDIR}/tutor/tutor.gr.cp737
+share/vim/${VIM_SUBDIR}/tutor/tutor.it
+share/vim/${VIM_SUBDIR}/tutor/tutor.ja.euc
+share/vim/${VIM_SUBDIR}/tutor/tutor.ja.sjis
+share/vim/${VIM_SUBDIR}/tutor/tutor.ja.utf-8
+share/vim/${VIM_SUBDIR}/tutor/tutor.ko.euc
+share/vim/${VIM_SUBDIR}/tutor/tutor.ko.utf-8
+share/vim/${VIM_SUBDIR}/tutor/tutor.no
+share/vim/${VIM_SUBDIR}/tutor/tutor.pl
+share/vim/${VIM_SUBDIR}/tutor/tutor.pl.cp1250
+share/vim/${VIM_SUBDIR}/tutor/tutor.ru
+share/vim/${VIM_SUBDIR}/tutor/tutor.ru.cp1251
+share/vim/${VIM_SUBDIR}/tutor/tutor.sk
+share/vim/${VIM_SUBDIR}/tutor/tutor.sv
 share/vim/${VIM_SUBDIR}/tutor/tutor.vim
+share/vim/${VIM_SUBDIR}/tutor/tutor.zh.big5
+share/vim/${VIM_SUBDIR}/tutor/tutor.zh.euc
 share/vim/${VIM_SUBDIR}/vimrc_example.vim
 @dirrm share/vim/${VIM_SUBDIR}/colors
 @dirrm share/vim/${VIM_SUBDIR}/compiler
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 74f6e901573..f16170cb17a 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.27 2003/06/02 07:27:26 martti Exp $
+$NetBSD: distinfo,v 1.28 2004/06/21 08:23:48 martti Exp $
 
-SHA1 (vim/vim-6.2.tar.bz2) = 6ce353635e1ae9194bb9bf8dd5226c5a8334bffb
-Size (vim/vim-6.2.tar.bz2) = 3269791 bytes
-SHA1 (patch-ad) = ea5585ac44b1696d1e1e848d7a038c1126f7ab7d
+SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
+Size (vim/vim-6.3.tar.bz2) = 3699397 bytes
+SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
+SHA1 (patch-ad) = 305b3f9cd2837482362c0176b8e2025ffb0eb254
 SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
new file mode 100644
index 00000000000..afea2010bdd
--- /dev/null
+++ b/editors/vim-share/patches/patch-aa
@@ -0,0 +1,9 @@
+$NetBSD: patch-aa,v 1.8 2004/06/21 08:23:48 martti Exp $
+
+--- src/auto/configure.orig	2004-06-12 00:47:47.000000000 +0000
++++ src/auto/configure	2004-06-12 00:49:00.000000000 +0000
+@@ -4546,3 +4546,3 @@
+ if test -z "$SKIP_MOTIF"; then
+-  gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
++  gui_XXX="${BUILDLINK_DIR}/include"
+     GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 563f9bf99db..3fb970d058d 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2003/06/02 07:27:26 martti Exp $
+$NetBSD: patch-ad,v 1.6 2004/06/21 08:23:48 martti Exp $
 
---- src/Makefile.orig	Sun Jun  1 16:18:29 2003
-+++ src/Makefile	Mon Jun  2 09:54:45 2003
-@@ -1045,26 +1045,31 @@
- ### Athena GUI
- ### Use Xaw3d to make the menus look a little bit nicer
+--- src/Makefile.orig	2004-05-16 13:52:54.000000000 +0000
++++ src/Makefile	2004-06-11 21:40:33.000000000 +0000
+@@ -1076,3 +1076,3 @@
  #XAW_LIB = -lXaw3d
 -XAW_LIB = -lXaw
 +#XAW_LIB = -lXaw
  
- ### When using Xaw3d, uncomment/comment the following lines to also get the
+@@ -1080,8 +1080,11 @@
  ### scrollbars from Xaw3d.
 -#ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
 -#ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
@@ -27,18 +25,13 @@ $NetBSD: patch-ad,v 1.5 2003/06/02 07:27:26 martti Exp $
 +		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
 +.else
  ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
- 			gui_at_sb.c gui_at_fs.c
- ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
- 			objects/pty.o objects/gui_beval.o \
- 			objects/gui_at_sb.o objects/gui_at_fs.o
+@@ -1092,2 +1095,4 @@
  ATHENA_DEFS	= -DFEAT_GUI_ATHENA $(NARROW_PROTO)
 +.endif # Xaw
 +.endif # defined(XAW_LIB)
  
- ATHENA_IPATH	= $(GUI_INC_LOC)
+@@ -1095,3 +1100,3 @@
  ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
 -ATHENA_LIBS1	= $(XAW_LIB)
 +ATHENA_LIBS1	= $(LIBXAW)
  ATHENA_LIBS2	= -lXt
- ATHENA_TARGETS	=  installglinks
- ATHENA_MAN_TARGETS = installghelplinks