Snapshot 23

Line numbers are brighter when bg=dark
This applies to ":set number" under the macvim color scheme.
2026-06-07 15:37:14 +02:00 · 2008-03-09 21:14:50 +01:00 · 2008-03-08 20:56:52 +01:00 · 2008-03-08 15:43:16 +01:00 · 2008-03-08 15:42:50 +01:00 · 2008-03-08 15:41:03 +01:00
1754 changed files with 191045 additions and 287018 deletions
@@ -0,0 +1,23 @@
+.*.swp
+.DS_Store
+src/MacVim/MacVim.xcodeproj/*.mode1
+src/MacVim/MacVim.xcodeproj/*.pbxuser
+src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.mode1
+src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.pbxuser
+src/MacVim/PSMTabBarControl/build
+src/MacVim/build
+src/TAGS
+src/Vim
+src/auto/config.h
+src/auto/config.mk
+src/auto/if_perl.c
+src/auto/link.log
+src/auto/link.sed
+src/auto/osdef.h
+src/auto/pathdef.c
+src/config.log
+src/config.status
+src/objects
+src/po/*.mo
+src/tags
+src/xxd/xxd
@@ -1,61 +0,0 @@
-syntax: glob
-
-# Unixen: object and executable files.
-*.o
-src/vim
-src/xxd/xxd
-src/auto/if_perl.c
-src/tags
-
-# We do need src/auto/configure.
-src/auto/config.aap
-src/auto/config.cache
-src/auto/config.h
-src/auto/config.log
-src/auto/config.mk
-src/auto/config.status
-src/auto/configure.aap
-src/auto/osdef.h
-src/auto/link.log
-src/auto/link.sed
-src/auto/pathdef.c
-
-# Windows
-*.exe
-*.idb
-*.manifest
-*.exp
-*.obj
-*.pdb
-*.ilk
-*.sln
-*.suo
-*.res
-*.RES
-src/if_perl.c
-src/pathdef.c
-src/Obj*/pathdef.c
-gvimext.dll
-gvimext.lib
-
-# Mac OSX
-src/xxd/xxd.dSYM
-
-# All platforms
-*.rej
-*.orig
-*.mo
-*.swp
-*~
-*.pyc
-src/po/vim.pot
-
-# Generated by "make test"
-src/po/*.ck 
-src/testdir/mbyte.vim 
-src/testdir/mzscheme.vim 
-src/testdir/lua.vim 
-src/testdir/small.vim 
-src/testdir/tiny.vim 
-src/testdir/test*.out
-src/testdir/test.log
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 7.4.  Also runs under UNIX, MSDOS and other systems.
-		vim74rt.tgz  contains the documentation and syntax files.
-		vim74bin.tgz contains the binaries.
-		vim74src.tgz contains the sources.
+		Version 7.1.  Also runs under UNIX, MSDOS and other systems.
+		vim71rt.tgz  contains the documentation and syntax files.
+		vim71bin.tgz contains the binaries.
+		vim71src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


@@ -7,7 +7,6 @@ SRC_ALL =	\
 		src/arabic.c \
 		src/arabic.h \
 		src/ascii.h \
-		src/blowfish.c \
 		src/buffer.c \
 		src/charset.c \
 		src/diff.c \
@@ -39,7 +38,6 @@ SRC_ALL =	\
 		src/mark.c \
 		src/mbyte.c \
 		src/memfile.c \
-		src/memfile_test.c \
 		src/memline.c \
 		src/menu.c \
 		src/message.c \
@@ -57,11 +55,9 @@ SRC_ALL =	\
 		src/popupmnu.c \
 		src/quickfix.c \
 		src/regexp.c \
-		src/regexp_nfa.c \
 		src/regexp.h \
 		src/screen.c \
 		src/search.c \
-		src/sha256.c \
 		src/structs.h \
 		src/spell.c \
 		src/syntax.c \
@@ -74,7 +70,6 @@ SRC_ALL =	\
 		src/version.c \
 		src/version.h \
 		src/vim.h \
-		src/winclip.c \
 		src/window.c \
 		src/xxd/xxd.c \
 		src/main.aap \
@@ -83,18 +78,7 @@ SRC_ALL =	\
 		src/testdir/test[0-9]*.ok \
 		src/testdir/test49.vim \
 		src/testdir/test60.vim \
-		src/testdir/test83-tags? \
-		src/testdir/python2/*.py \
-		src/testdir/python3/*.py \
-		src/testdir/pythonx/*.py \
-		src/testdir/pythonx/topmodule/__init__.py \
-		src/testdir/pythonx/topmodule/submodule/__init__.py \
-		src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py \
-		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
-		src/testdir/python_after/*.py \
-		src/testdir/python_before/*.py \
 		src/proto.h \
-		src/proto/blowfish.pro \
 		src/proto/buffer.pro \
 		src/proto/charset.pro \
 		src/proto/diff.pro \
@@ -132,7 +116,6 @@ SRC_ALL =	\
 		src/proto/regexp.pro \
 		src/proto/screen.pro \
 		src/proto/search.pro \
-		src/proto/sha256.pro \
 		src/proto/spell.pro \
 		src/proto/syntax.pro \
 		src/proto/tag.pro \
@@ -141,7 +124,6 @@ SRC_ALL =	\
 		src/proto/ui.pro \
 		src/proto/undo.pro \
 		src/proto/version.pro \
-		src/proto/winclip.pro \
 		src/proto/window.pro \


@@ -155,7 +137,6 @@ SRC_UNIX =	\
 		pixmaps/gen-inline-pixbufs.sh \
 		pixmaps/stock_icons.h \
 		src/INSTALL \
-		src/INSTALLx.txt \
 		src/Makefile \
 		src/auto/configure \
 		src/config.aap.in \
@@ -212,7 +193,6 @@ SRC_UNIX =	\
 		src/vim_icon.xbm \
 		src/vim_mask.xbm \
 		src/vimtutor \
-		src/gvimtutor \
 		src/which.sh \
 		src/workshop.c \
 		src/workshop.h \
@@ -224,24 +204,19 @@ SRC_UNIX =	\
 SRC_DOS_UNIX =	\
 		src/if_cscope.c \
 		src/if_cscope.h \
-		src/if_lua.c \
 		src/if_mzsch.c \
 		src/if_mzsch.h \
 		src/if_perl.xs \
 		src/if_perlsfio.c \
 		src/if_python.c \
-		src/if_python3.c \
-		src/if_py_both.h \
 		src/if_ruby.c \
 		src/if_sniff.h \
 		src/if_tcl.c \
 		src/proto/if_cscope.pro \
-		src/proto/if_lua.pro \
 		src/proto/if_mzsch.pro \
 		src/proto/if_perl.pro \
 		src/proto/if_perlsfio.pro \
 		src/proto/if_python.pro \
-		src/proto/if_python3.pro \
 		src/proto/if_ruby.pro \
 		src/proto/if_tcl.pro \
 		src/typemap \
@@ -273,10 +248,7 @@ SRC_DOS =	\
 		src/Make_mvc.mak \
 		src/Make_w16.mak \
 		src/bigvim.bat \
-		src/bigvim64.bat \
 		src/msvcsetup.bat \
-		src/msvc2008.bat \
-		src/msvc2010.bat \
 		src/dimm.idl \
 		src/dlldata.c \
 		src/dosinst.c \
@@ -310,7 +282,6 @@ SRC_DOS =	\
 		src/proto/os_win32.pro \
 		src/proto/os_mswin.pro \
 		src/testdir/Make_dos.mak \
-		src/testdir/Make_ming.mak \
 		src/testdir/dos.vim \
 		src/uninstal.c \
 		src/vim.def \
@@ -327,7 +298,6 @@ SRC_DOS =	\
 		src/xxd/Make_bc5.mak \
 		src/xxd/Make_cyg.mak \
 		src/xxd/Make_djg.mak \
-		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
 		nsis/gvim.nsi \
 		nsis/README.txt \
@@ -362,13 +332,6 @@ SRC_DOS_BIN =	\
 		src/vim*.ico \
 		src/vim.tlb \
 		src/vimtbar.lib \
-		src/xpm/COPYRIGHT \
-		src/xpm/README.txt \
-		src/xpm/include/*.h \
-		src/xpm/x64/lib/libXpm.a \
-		src/xpm/x64/lib/libXpm.lib \
-		src/xpm/x86/lib/libXpm.a \
-		src/xpm/x86/lib/libXpm.lib \
 		src/vimtbar.dll \
 		nsis/icons/*.bmp \
 		nsis/icons/*.ico \
@@ -402,7 +365,7 @@ SRC_MAC =	\
 		src/os_mac.h \
 		src/os_mac.rsr.hqx \
 		src/os_mac_conv.c \
-		src/os_macosx.m \
+		src/os_macosx.c \
 		src/proto/gui_mac.pro \
 		src/proto/os_mac_conv.pro \

@@ -450,14 +413,20 @@ SRC_EXTRA =	\
 		$(SRC_VMS) \
 		README_os390.txt \
 		src/Make_mint.mak \
+		src/Make_ro.mak \
+		src/gui_riscos.c \
+		src/gui_riscos.h \
 		src/if_sniff.c \
 		src/infplist.xml \
 		src/link.390 \
 		src/os_beos.c \
 		src/os_beos.h \
 		src/os_beos.rsrc \
-		src/proto/os_beos.pro \
 		src/os_mint.h \
+		src/os_riscos.c \
+		src/os_riscos.h \
+		src/proto/gui_riscos.pro \
+		src/proto/os_riscos.pro \
 		src/os_vms_fix.com \
 		src/toolbar.phi \

@@ -484,7 +453,6 @@ RT_ALL =	\
 		runtime/macros/hanoi/hanoi.vim \
 		runtime/macros/hanoi/poster \
 		runtime/macros/justify.vim \
-		runtime/macros/less.bat \
 		runtime/macros/less.sh \
 		runtime/macros/less.vim \
 		runtime/macros/life/click.me \
@@ -545,7 +513,6 @@ RT_SCRIPTS =	\
 		runtime/indent/*.vim \
 		runtime/indent/README.txt \
 		runtime/ftplugin/*.vim \
-		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \
 		runtime/plugin/*.vim \
 		runtime/plugin/README.txt \
@@ -682,19 +649,17 @@ EXTRA =		\
 		farsi/fonts/*/far-* \
 		runtime/vimlogo.xpm \
 		src/swis.s \
-		src/tee/Makefile \
+		src/tee/Makefile* \
 		src/tee/tee.c \
 		csdpmi4b.zip \

 # generic language files
 LANG_GEN = \
-		runtime/doc/*-de.1 \
-		runtime/doc/*-de.UTF-8.1 \
+		README_lang.txt \
 		runtime/doc/*-fr.1 \
 		runtime/doc/*-fr.UTF-8.1 \
 		runtime/doc/*-it.1 \
 		runtime/doc/*-it.UTF-8.1 \
-		runtime/doc/*-ja.UTF-8.1 \
 		runtime/doc/*-pl.1 \
 		runtime/doc/*-pl.UTF-8.1 \
 		runtime/doc/*-ru.1 \
@@ -705,30 +670,25 @@ LANG_GEN = \
 		runtime/keymap/*.vim \
 		runtime/tutor/README.*.txt \
 		runtime/tutor/Makefile \
-		runtime/tutor/tutor.utf-8 \
 		runtime/tutor/tutor.?? \
-		runtime/tutor/tutor.??.utf-8 \
-		runtime/tutor/tutor.??.euc \
-		runtime/tutor/tutor.??.sjis \
-		runtime/tutor/tutor.??.iso9 \
-		runtime/tutor/tutor.??.big5 \
-		runtime/tutor/tutor.??.cp1250 \
-		runtime/tutor/tutor.??.cp1251 \
-		runtime/tutor/tutor.??.cp737 \
-		runtime/tutor/tutor.??_??.utf-8 \
-		runtime/tutor/tutor.bar \
-		runtime/tutor/tutor.bar.utf-8 \
+		runtime/tutor/tutor.cs.* \
+		runtime/tutor/tutor.gr.* \
+		runtime/tutor/tutor.hu.* \
+		runtime/tutor/tutor.ja.* \
+		runtime/tutor/tutor.ko.* \
+		runtime/tutor/tutor.pl.* \
+		runtime/tutor/tutor.ru.* \
+		runtime/tutor/tutor.sk.* \
+		runtime/tutor/tutor.tr.* \
+		runtime/tutor/tutor.zh.* \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
-		runtime/spell/tet/*.diff \
-		runtime/spell/tet/main.aap \
-		runtime/spell/check/main.aap \
-		runtime/spell/check/*.aff \
-		runtime/spell/check/*.dic \
 		runtime/spell/yi/README.txt \
 		runtime/spell/main.aap \
+		runtime/spell/cleanadd.vim \
 		runtime/spell/*.vim \
+		runtime/spell/fixdup \

 # generic language files, binary
 LANG_GEN_BIN = \
@@ -3,10 +3,8 @@
 # 2. Creating the various distribution files.


-#########################################################################
-# 1. Starting the compilation of Vim for Unix.
+# 1. Using this Makefile without an argument will compile Vim for Unix.
 #
-# Using this Makefile without an argument will compile Vim for Unix.
 # "make install" is also possible.
 #
 # NOTE: If this doesn't work properly, first change directory to "src" and use
@@ -23,9 +21,6 @@
 # has run can result in compiling with $(CC) empty.

 first:
-	@if test ! -f src/auto/config.mk; then \
-		cp src/config.mk.dist src/auto/config.mk; \
-	fi
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@
@@ -33,22 +28,25 @@ first:
 # Some make programs use the last target for the $@ default; put the other
 # targets separately to always let $@ expand to "first" by default.
 all install uninstall tools config configure reconfig proto depend lint tags types test testclean clean distclean:
-	@if test ! -f src/auto/config.mk; then \
-		cp src/config.mk.dist src/auto/config.mk; \
-	fi
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@


-#########################################################################
-# 2. Creating the various distribution files.
+# 2. Create the various distributions:
 #
 # TARGET	PRODUCES		CONTAINS
-# unixall	vim-#.#.tar.bz2		All runtime files and sources, for Unix
+# unixall	vim-#.#.tar.bz2		Runtime files and Sources for Unix
+#
+# extra		vim-#.#-extra.tar.gz	Extra source and runtime files
+# lang		vim-#.#-lang.tar.gz	multi-language files
 #
 # html		vim##html.zip		HTML docs
 #
+# amisrc	vim##src.tgz		sources for Amiga
+# amirt		vim##rt.tgz		runtime for Amiga
+# amibin	vim##bin.tgz		binary for Amiga
+#
 # dossrc	vim##src.zip		sources for MS-DOS
 # dosrt		vim##rt.zip		runtime for MS-DOS
 # dosbin	vim##d16.zip		binary for MS-DOS 16 bits
@@ -57,11 +55,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #		gvim##.zip		binary for GUI Win32
 #		gvim##ole.zip		OLE exe for Win32 GUI
 #		gvim##_s.zip		exe for Win32s GUI
-#
-# OBSOLETE
-# amisrc	vim##src.tgz		sources for Amiga
-# amirt		vim##rt.tgz		runtime for Amiga
-# amibin	vim##bin.tgz		binary for Amiga
+# doslang	vim##lang.zip		language files for Win32
 #
 # os2bin	vim##os2.zip		binary for OS/2
 #					(use RT from dosrt)
@@ -70,44 +64,31 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #
 #    All output files are created in the "dist" directory.  Existing files are
 #    overwritten!
-#    To do all this you need the Unix archive and compiled binaries.
+#    To do all this you need the unix, extra and lang archives, and
+#    compiled binaries.
 #    Before creating an archive first delete all backup files, *.orig, etc.

 MAJOR = 7
-MINOR = 4
+MINOR = 1

 # Uncomment this line if the Win32s version is to be included.
-# DOSBIN_S =  dosbin_s
-
-# Uncomment this line if the 16 bit DOS version is to be included.
-# DOSBIN_D16 = dosbin_d16
-
-# Uncomment this line if the 32 bit DOS version is to be included.
-# DOSBIN_D32 = dosbin_d32
+DOSBIN_S =  dosbin_s

 # CHECKLIST for creating a new version:
 #
 # - Update Vim version number.  For a test version in: src/version.h, Contents,
 #   MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt,
 #   runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt.  For a
-#   minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def,
-#   src/gvim.exe.mnf.
-# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
-#   you can make it all work), Cscope and "huge" features.  Exclude workshop
-#   and SNiFF.
+#   minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def.
+# - Correct included_patches[] in src/version.c.
+# - Compile Vim with GTK, Perl, Python, TCL, Ruby, MZscheme (if you can make it
+#   work), Cscope and "huge" features.  Exclude workshop and SNiFF.
 # - With these features: "make proto" (requires cproto and Motif installed;
 #   ignore warnings for missing include files, fix problems for syntax errors).
 # - With these features: "make depend" (works best with gcc).
-# - If you have a lint program: "make lint" and check the output (ignore GTK
-#   warnings).
-# - If you have valgrind, enable it in src/testdir/Makefile and run "make
-#   test".  Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
-#   Check the valgrind output.
-# - If you have the efence library, enable it in "src/Makefile" and run "make
-#   test".  Disable Python and Ruby to avoid trouble with threads (efence is
-#   not threadsafe).
-# - Adjust the date and other info in src/version.h.
-# - Correct included_patches[] in src/version.c.
+# - "make lint" and check the output (ignore GTK warnings).
+# - Enable the efence library in "src/Makefile" and run "make test".  May
+#   require disabling Python and Ruby to avoid trouble with threads.
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
@@ -115,16 +96,16 @@ MINOR = 4
 # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
 #   ADDITIONS".
 # - In runtime/doc run "make" and "make html" to check for errors.
-# - Check if src/Makefile, src/testdir/Makefile and src/feature.h don't contain
-#   any personal preferences or the changes mentioned above.
+# - Check if src/Makefile and src/feature.h don't contain any personal
+#   preferences or the GTK, Perl, etc. mentioned above.
 # - Check file protections to be "644" for text and "755" for executables (run
 #   the "check" script).
 # - Check compiling on Amiga, MS-DOS and MS-Windows.
 # - Delete all *~, *.sw?, *.orig, *.rej files
-# - "make unixall", "make html"
+# - "make unixall", "make extra", "make lang", "make html"
 # - Make diff files against the previous release: "makediff7 7.1 7.2"
 #
-# Amiga: (OBSOLETE, Amiga files are no longer distributed)
+# Amiga:
 # - "make amisrc", move the archive to the Amiga and compile:
 #   "make -f Make_manx.mak" (will use "big" features by default).
 # - Run the tests: "make -f Make_manx.mak test"
@@ -133,22 +114,32 @@ MINOR = 4
 # - "make amirt", "make amibin".
 #
 # PC:
-# - Run make on Unix to update the ".mo" files.
 # - "make dossrc" and "make dosrt".  Unpack the archives on a PC.
+# 16 bit DOS version:
+# - Set environment for compiling with Borland C++ 3.1.
+# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
+#   case set environment for compiling with Borland C++ 4.0 and do
+#   "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
+# - "make test" and check the output.
+# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
+#   "uninstald16.exe".
+# 32 bit DOS version:
+# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
+# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output.
+# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
+#   "uninstald32.exe".
 # Win32 console version:
-# - Set environment for Visual C++ 2008, e.g.: "msvc2008.bat"  Or:
-#   "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".
-#   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
+# - Set environment for Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
 #   paths when necessary).
-#   For Windows 98/ME the 2003 version is required, but then the executable
-#   won't work on Windows 7 and 64 bit systems.
-# - "nmake -f Make_mvc.mak"  (use the same path as for vcvars32.bat)
+# - "nmake -f Make_mvc.mak"
 # - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
-# - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
+# - Rename the executables to "vimw32.exe", "xxdw32.exe".
 # - Rename vim.pdb to vimw32.pdb.
-# - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
+# - When building the Win32s version later, delete vimrun.exe, install.exe and
+#   uninstal.exe.  Otherwise rename executables to installw32.exe and
+#   uninstalw32.exe.
 # Win32 GUI version:
-# - "nmake -f Make_mvc.mak GUI=yes"
+# - "nmake -f Make_mvc.mak GUI=yes.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Delete vimrun.exe, install.exe and uninstal.exe.
@@ -158,64 +149,35 @@ MINOR = 4
 # - Rename "gvim.exe" to "gvim_ole.exe".
 # - Rename gvim.pdb to "gvim_ole.pdb".
 # - Delete install.exe and uninstal.exe.
-# Create the archives:
-# - Copy all the "*.exe" files to where this Makefile is.
-# - Copy all the "*.pdb" files to where this Makefile is.
-# - "make dosbin".
-# NSIS self installing exe:
-# - To get NSIS see http://nsis.sourceforge.net
-# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
-#   uninstalw32.exe and xxdw32.exe have been build as mentioned above.
-# - copy these files (get them from a binary archive or build them):
-#	gvimext.dll in src/GvimExt
-#	gvimext64.dll in src/GvimExt
-#	VisVim.dll in src/VisVim
-#   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
-#   gvimext64.dll can be obtained from http://code.google.com/p/vim-win3264/
-#	It is part of vim72.zip as vim72/gvimext.dll.
-# - make sure there is a diff.exe two levels up
-# - go to ../nsis and do "makensis gvim.nsi" (takes a few minutes).
-# - Copy gvim##.exe to the dist directory.
-#
-# 64 bit builds (these are not in the normal distribution, the 32 bit build
-# works just fine on 64 bit systems).
-# Like the console and GUI version, but first run vcvars64.bat or
-#   "..\VC\vcvarsall.bat x86_amd64".
-# - "nmake -f Make_mvc.mak"
-# - "nmake -f Make_mvc.mak GUI=yes"
-# Or run src/bigvim64.bat for an OLE version.
-#
-# OBSOLETE systems: You can build this if you have an appropriate system.
-#
-# 16 bit DOS version: (doesn't build anywhere)
-# - Set environment for compiling with Borland C++ 3.1.
-# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
-#   case set environment for compiling with Borland C++ 4.0 and do
-#   "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
-#   NOTE: this currently fails because Vim is too big.
-# - "make test" and check the output.
-# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
-#   "uninstald16.exe".
-#
-# 32 bit DOS version: (requires Windows XP or earlier)
-# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
-# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
-#   "ALL DONE".
-# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
-#   "uninstald32.exe".
-#
-# Win32s GUI version: (requires very old compiler)
-# - Set environment for Visual C++ 4.1 (requires a new console window):
-#   "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
+# - If building the Win32s version delete vimrun.exe.
+# Win32s GUI version:
+# - Set environment for Visual C++ 4.1 (requires a new console window)
+# - "vcvars32" (use the path for VC 4.1 e:\msdev\bin)
 # - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
 # - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
 # - Rename "gvim.exe" to "gvim_w32s.exe".
 # - Rename "install.exe" to "installw32.exe"
 # - Rename "uninstal.exe" to "uninstalw32.exe"
 # - The produced uninstalw32.exe and vimrun.exe are used.
+# Create the archives:
+# - Copy all the "*.exe" files to where this Makefile is.
+# - Copy all the "*.pdb" files to where this Makefile is.
+# - "make dosbin".
+# - Run make on Unix to update the ".mo" files.
+# - "make doslang".
+# NSIS self installing exe:
+# - Unpack the doslang archive on the PC.
+# - Make sure gvim_ole.exe, vimd32.exe, vimw32.exe, installw32.exe,
+#   uninstalw32.exe and xxdw32.exe have been build as mentioned above.
+# - put gvimext.dll in src/GvimExt and VisVim.dll in src/VisVim (get them
+#   from a binary archive or build them)
+#   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
+# - make sure there is a diff.exe two levels up
+# - go to ../nsis and do "makensis gvim.nsi".
+# - Copy gvim##.exe to the dist directory.
 #
-# OS/2: (requires an OS/2 system)
-# - Unpack the Unix archive.
+# OS/2:
+# - Unpack the Unix "src", "extra" and "rt" archives.
 # - "make -f Make_os2.mak".
 # - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy
 #   them to here.
@@ -250,6 +212,8 @@ dist/comment:
 	mkdir dist/comment

 COMMENT_RT = comment/$(VERSION)-rt
+COMMENT_RT1 = comment/$(VERSION)-rt1
+COMMENT_RT2 = comment/$(VERSION)-rt2
 COMMENT_D16 = comment/$(VERSION)-bin-d16
 COMMENT_D32 = comment/$(VERSION)-bin-d32
 COMMENT_W32 = comment/$(VERSION)-bin-w32
@@ -260,10 +224,17 @@ COMMENT_SRC = comment/$(VERSION)-src
 COMMENT_OS2 = comment/$(VERSION)-bin-os2
 COMMENT_HTML = comment/$(VERSION)-html
 COMMENT_FARSI = comment/$(VERSION)-farsi
+COMMENT_LANG = comment/$(VERSION)-lang

 dist/$(COMMENT_RT): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)

+dist/$(COMMENT_RT1): dist/comment
+	echo "Vim - Vi IMproved - v$(VDOT) runtime files (PART 1) for MS-DOS and MS-Windows" > dist/$(COMMENT_RT1)
+
+dist/$(COMMENT_RT2): dist/comment
+	echo "Vim - Vi IMproved - v$(VDOT) runtime files (PART 2) for MS-DOS and MS-Windows" > dist/$(COMMENT_RT2)
+
 dist/$(COMMENT_D16): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-DOS 16 bit real mode" > dist/$(COMMENT_D16)

@@ -294,6 +265,9 @@ dist/$(COMMENT_HTML): dist/comment
 dist/$(COMMENT_FARSI): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) Farsi language files" > dist/$(COMMENT_FARSI)

+dist/$(COMMENT_LANG): dist/comment
+	echo "Vim - Vi IMproved - v$(VDOT) MS-Windows language files" > dist/$(COMMENT_LANG)
+
 unixall: dist prepare
 	-rm -f dist/$(VIMVER).tar.bz2
 	-rm -rf dist/$(VIMRTDIR)
@@ -309,17 +283,33 @@ unixall: dist prepare
 		$(SRC_ALL) \
 		$(SRC_UNIX) \
 		$(SRC_DOS_UNIX) \
-		$(EXTRA) \
-		$(LANG_SRC) \
 		| (cd dist/$(VIMRTDIR); tar xf -)
 # Need to use a "distclean" config.mk file
-# Note: this file is not included in the repository to avoid problems, but it's
-# OK to put it in the archive.
 	cp -f src/config.mk.dist dist/$(VIMRTDIR)/src/auto/config.mk
 # Create an empty config.h file, make dependencies require it
 	touch dist/$(VIMRTDIR)/src/auto/config.h
 # Make sure configure is newer than config.mk to force it to be generated
 	touch dist/$(VIMRTDIR)/src/configure
+	cd dist && tar cf $(VIMVER).tar $(VIMRTDIR)
+	bzip2 dist/$(VIMVER).tar
+
+extra: dist prepare
+	-rm -f dist/$(VIMVER)-extra.tar.gz
+	-rm -rf dist/$(VIMRTDIR)
+	mkdir dist/$(VIMRTDIR)
+	tar cf - \
+		$(EXTRA) \
+		| (cd dist/$(VIMRTDIR); tar xf -)
+	cd dist && tar cf $(VIMVER)-extra.tar $(VIMRTDIR)
+	gzip -9 dist/$(VIMVER)-extra.tar
+
+lang: dist prepare
+	-rm -f dist/$(VIMVER)-lang.tar.gz
+	-rm -rf dist/$(VIMRTDIR)
+	mkdir dist/$(VIMRTDIR)
+	tar cf - \
+		$(LANG_SRC) \
+		| (cd dist/$(VIMRTDIR); tar xf -)
 # Make sure ja.sjis.po is newer than ja.po to avoid it being regenerated.
 # Same for cs.cp1250.po, pl.cp1250.po and sk.cp1250.po.
 	touch dist/$(VIMRTDIR)/src/po/ja.sjis.po
@@ -329,11 +319,9 @@ unixall: dist prepare
 	touch dist/$(VIMRTDIR)/src/po/zh_CN.cp936.po
 	touch dist/$(VIMRTDIR)/src/po/ru.cp1251.po
 	touch dist/$(VIMRTDIR)/src/po/uk.cp1251.po
-# Create the archive.
-	cd dist && tar cf $(VIMVER).tar $(VIMRTDIR)
-	bzip2 dist/$(VIMVER).tar
+	cd dist && tar cf $(VIMVER)-lang.tar $(VIMRTDIR)
+	gzip -9 dist/$(VIMVER)-lang.tar

-# Amiga runtime - OBSOLETE
 amirt: dist prepare
 	-rm -f dist/vim$(VERSION)rt.tar.gz
 	-rm -rf dist/Vim
@@ -356,7 +344,6 @@ amirt: dist prepare
 	gzip -9 dist/vim$(VERSION)rt.tar
 	mv dist/vim$(VERSION)rt.tar.gz dist/vim$(VERSION)rt.tgz

-# Amiga binaries - OBSOLETE
 amibin: dist prepare
 	-rm -f dist/vim$(VERSION)bin.tar.gz
 	-rm -rf dist/Vim
@@ -374,7 +361,6 @@ amibin: dist prepare
 	gzip -9 dist/vim$(VERSION)bin.tar
 	mv dist/vim$(VERSION)bin.tar.gz dist/vim$(VERSION)bin.tgz

-# Amiga sources - OBSOLETE
 amisrc: dist prepare
 	-rm -f dist/vim$(VERSION)src.tar.gz
 	-rm -rf dist/Vim
@@ -395,41 +381,15 @@ amisrc: dist prepare
 no_title.vim: Makefile
 	echo "set notitle noicon nocp nomodeline viminfo=" >no_title.vim

-# MS-DOS sources
-dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt
-	-rm -rf dist/vim$(VERSION)src.zip
-	-rm -rf dist/vim
-	mkdir dist/vim
-	mkdir dist/vim/$(VIMRTDIR)
-	tar cf - \
-		$(SRC_ALL) \
-		$(SRC_DOS) \
-		$(SRC_AMI_DOS) \
-		$(SRC_DOS_UNIX) \
-		runtime/doc/uganda.nsis.txt \
-		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
-	rmdir dist/vim/$(VIMRTDIR)/runtime
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
-	tar cf - \
-		$(SRC_DOS_BIN) \
-		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
-
-runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
-	cd runtime/doc && $(MAKE) uganda.nsis.txt
-
 dosrt: dist dist/$(COMMENT_RT) dosrt_unix2dos
 	-rm -rf dist/vim$(VERSION)rt.zip
 	cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)

-# Split in two parts to avoid an "argument list too long" error.
+# Split in two parts to avoid a "argument list too long" error.
 dosrt_unix2dos: dist prepare no_title.vim
 	-rm -rf dist/vim
 	mkdir dist/vim
 	mkdir dist/vim/$(VIMRTDIR)
-	mkdir dist/vim/$(VIMRTDIR)/lang
-	cd src && MAKEMO=yes $(MAKE) languages
 	tar cf - \
 		$(RT_ALL) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
@@ -440,7 +400,7 @@ dosrt_unix2dos: dist prepare no_title.vim
 		$(RT_AMI_DOS) \
 		$(LANG_GEN) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	tar cf - \
 		$(RT_UNIX_DOS_BIN) \
 		$(RT_ALL_BIN) \
@@ -449,18 +409,6 @@ dosrt_unix2dos: dist prepare no_title.vim
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
-# Add the message translations.  Trick: skip ja.mo and use ja.sjis.mo instead.
-# Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo,
-# zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and ru.mo / ru.cp1251.mo.
-	for i in $(LANG_DOS); do \
-	      if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \
-		n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp1251\)*\(.cp936\)*.mo+\1+"`; \
-		mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \
-		mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \
-		cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
-	      fi \
-	    done
-	cp libintl.dll dist/vim/$(VIMRTDIR)/


 # Convert runtime files from Unix fileformat to dos fileformat.
@@ -470,7 +418,7 @@ runtime_unix2dos: dosrt_unix2dos
 	cd dist/vim/$(VIMRTDIR); tar cf - * \
 		| (cd ../../../runtime/dos; tar xf -)

-dosbin: prepare dosbin_gvim dosbin_w32 $(DOSBIN_D32) dosbin_ole $(DOSBIN_S) $(DOSBIN_D16)
+dosbin: prepare dosbin_gvim dosbin_w32 dosbin_d32 dosbin_d16 dosbin_ole $(DOSBIN_S)

 # make Win32 gvim
 dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
@@ -481,7 +429,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
 	tar cf - \
 		$(BIN_DOS) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp gvim.exe dist/vim/$(VIMRTDIR)/gvim.exe
 	cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
@@ -500,7 +448,7 @@ dosbin_w32: dist no_title.vim dist/$(COMMENT_W32)
 	tar cf - \
 		$(BIN_DOS) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp vimw32.exe dist/vim/$(VIMRTDIR)/vim.exe
 	cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
@@ -517,7 +465,7 @@ dosbin_d32: dist no_title.vim dist/$(COMMENT_D32)
 	tar cf - \
 		$(BIN_DOS) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp vimd32.exe dist/vim/$(VIMRTDIR)/vim.exe
 	cp xxdd32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp installd32.exe dist/vim/$(VIMRTDIR)/install.exe
@@ -534,7 +482,7 @@ dosbin_d16: dist no_title.vim dist/$(COMMENT_D16)
 	tar cf - \
 		$(BIN_DOS) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp vimd16.exe dist/vim/$(VIMRTDIR)/vim.exe
 	cp xxdd16.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp installd16.exe dist/vim/$(VIMRTDIR)/install.exe
@@ -550,7 +498,7 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
 	tar cf - \
 		$(BIN_DOS) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp gvim_ole.exe dist/vim/$(VIMRTDIR)/gvim.exe
 	cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
@@ -572,7 +520,7 @@ dosbin_s: dist no_title.vim dist/$(COMMENT_W32S)
 	tar cf - \
 		$(BIN_DOS) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp gvim_w32s.exe dist/vim/$(VIMRTDIR)/gvim.exe
 	cp xxdd32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp README_w32s.txt dist/vim/$(VIMRTDIR)
@@ -580,6 +528,53 @@ dosbin_s: dist no_title.vim dist/$(COMMENT_W32S)
 	cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
 	cd dist && zip -9 -rD -z gvim$(VERSION)_s.zip vim <$(COMMENT_W32S)

+# make Win32 lang archive
+doslang: dist prepare no_title.vim dist/$(COMMENT_LANG)
+	-rm -rf dist/vim$(VERSION)lang.zip
+	-rm -rf dist/vim
+	mkdir dist/vim
+	mkdir dist/vim/$(VIMRTDIR)
+	mkdir dist/vim/$(VIMRTDIR)/lang
+	cd src && MAKEMO=yes $(MAKE) languages
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
+# Add the message translations.  Trick: skip ja.mo and use ja.sjis.mo instead.
+# Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo,
+# zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and ru.mo / ru.cp1251.mo.
+	for i in $(LANG_DOS); do \
+	      if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \
+		n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp1251\)*\(.cp936\)*.mo+\1+"`; \
+		mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \
+		mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \
+		cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
+	      fi \
+	    done
+	cp libintl.dll dist/vim/$(VIMRTDIR)/
+	cd dist && zip -9 -rD -z vim$(VERSION)lang.zip vim <$(COMMENT_LANG)
+
+# MS-DOS sources
+dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt
+	-rm -rf dist/vim$(VERSION)src.zip
+	-rm -rf dist/vim
+	mkdir dist/vim
+	mkdir dist/vim/$(VIMRTDIR)
+	tar cf - \
+		$(SRC_ALL) \
+		$(SRC_DOS) \
+		$(SRC_AMI_DOS) \
+		$(SRC_DOS_UNIX) \
+		runtime/doc/uganda.nsis.txt \
+		| (cd dist/vim/$(VIMRTDIR); tar xf -)
+	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
+	rmdir dist/vim/$(VIMRTDIR)/runtime
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
+	tar cf - \
+		$(SRC_DOS_BIN) \
+		| (cd dist/vim/$(VIMRTDIR); tar xf -)
+	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
+
+runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
+	cd runtime/doc && $(MAKE) uganda.nsis.txt
+
 os2bin: dist no_title.vim dist/$(COMMENT_OS2)
 	-rm -rf dist/vim$(VERSION)os2.zip
 	-rm -rf dist/vim
@@ -588,7 +583,7 @@ os2bin: dist no_title.vim dist/$(COMMENT_OS2)
 	tar cf - \
 		$(BIN_OS2) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
-	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -X -u no_title.vim -c ":set tx|wq" {} \;
+	find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -e -u no_title.vim -c ":set tx|wq" {} \;
 	cp vimos2.exe dist/vim/$(VIMRTDIR)/vim.exe
 	cp xxdos2.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp teeos2.exe dist/vim/$(VIMRTDIR)/tee.exe
@@ -1,4 +1,4 @@
-README.txt for version 7.4 of Vim: Vi IMproved.
+README.txt for version 7.1 of Vim: Vi IMproved.


 WHAT IS VIM
@@ -9,13 +9,13 @@ on-line help, spell checking, filename completion, block operations, etc.
 There is also a Graphical User Interface (GUI) available.  See
 "runtime/doc/vi_diff.txt" for differences with Vi.

-This editor is very useful for editing programs and other plain text files.
+This editor is very useful for editing programs and other plain ASCII files.
 All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 defined by the user, and the mouse can be used.

-Vim runs under Amiga DOS, MS-DOS, MS-Windows (95, 98, Me, NT, 2000, XP, Vista,
-7), Atari MiNT, Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of
+Vim currently runs under Amiga DOS, MS-DOS, MS-Windows 95/98/Me/NT/2000/XP,
+Atari MiNT, Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of
 UNIX.  Porting to other systems should not be very difficult.


@@ -32,19 +32,19 @@ an overview of currently available distributions.

 DOCUMENTATION

-The vim tutor is a one hour training course for beginners.  Mostly it can be
-started as "vimtutor".  See ":help tutor" for more information.
-
 The best is to use ":help" in Vim.  If you don't have an executable yet, read
 "runtime/doc/help.txt".  It contains pointers to the other documentation
 files.  The User Manual reads like a book and is recommended to learn to use
 Vim.  See ":help user-manual".

+The vim tutor is a one hour training course for beginners.  Mostly it can be
+started as "vimtutor".  See ":help tutor" for more information.
+

 COPYING

 Vim is Charityware.  You can use and copy it as much as you like, but you are
-encouraged to make a donation to help orphans in Uganda.  Please read the file
+encouraged to make a donation to orphans in Uganda.  Please read the file
 "runtime/doc/uganda.txt" for details (do ":help uganda" inside Vim).

 Summary of the license: There are no restrictions on using or distributing an
@@ -86,8 +86,6 @@ README_os2.txt		OS/2
 README_mac.txt		Macintosh
 README_vms.txt		VMS

-There are more README_*.txt files, depending on the distribution you used.
-

 INFORMATION

@@ -97,19 +95,47 @@ The latest news about Vim can be found on the Vim home page:
 If you have problems, have a look at the Vim FAQ:
 	http://vimdoc.sf.net/vimfaq.html

-If you still have problems or any other questions, use one of the mailing
-lists to discuss them with Vim users and developers:
-	http://www.vim.org/maillist.php
-
-If nothing else works, report bugs directly:
+Send bug reports to:
 	Bram Moolenaar <Bram@vim.org>

+There are five mailing lists for Vim:
+<vim@vim.org>
+	For discussions about using existing versions of Vim: Useful mappings,
+	questions, answers, where to get a specific version, etc.
+<vim-dev@vim.org>
+	For discussions about changing Vim: New features, porting, beta-test
+	versions, etc.
+<vim-announce@vim.org>
+	Announcements about new versions of Vim; also beta-test versions and
+	ports to different systems.
+<vim-multibyte@vim.org>
+	For discussions about using and improving the multi-byte aspects of
+	Vim: XIM, Hangul, fontset, etc.
+<vim-mac@vim.org>
+	For discussions about using and improving Vim on the Macintosh.
+
+For more info and URLs of the archives see "http://www.vim.org/maillist.php".
+
+NOTE:
+- You can only send messages to these lists if you have subscribed!
+- You need to send the messages from the same location as where you subscribed
+  from (to avoid spam mail).
+- Maximum message size is 40000 characters.
+
+If you want to join a maillist, send a message to
+	<vim-help@vim.org>
+Make sure that your "From:" address is correct.  Then the list server will
+send you a help message.
+

 MAIN AUTHOR

-Send any other comments, patches, flowers and suggestions to:
+Send any other comments, patches, pizza and suggestions to:

 	Bram Moolenaar		E-mail:	Bram@vim.org
-	Finsterruetihof 1
-	8134 Adliswil
-	Switzerland
+	Molenstraat 2
+	2161 HP  Lisse
+	The Netherlands
+
+This is the address of my parents, they will forward mail and eat the pizza.
+My actual address will change a couple of times in 2006.
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.4 of Vim: Vi IMproved.
+README_ami.txt for version 7.1 of Vim: Vi IMproved.

 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.4 of Vim: Vi IMproved.
+README_amibin.txt for version 7.1 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.4 of Vim: Vi IMproved.
+README_amisrc.txt for version 7.1 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
@@ -1,16 +1,19 @@
-README_bindos.txt for version 7.4 of Vim: Vi IMproved.
+README_bindos.txt for version 7.1 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim74rt.zip).
+These files are in the runtime archive (vim70rt.zip).


 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim74w32.zip	Windows 95/98/NT/etc. console version
-	gvim74.zip	Windows 95/98/NT/etc. GUI version
-	gvim74ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim70d16.zip	16 bit DOS version
+	vim70d32.zip	32 bit DOS version
+	vim70w32.zip	Windows 95/98/NT/etc. console version
+	gvim70.zip	Windows 95/98/NT/etc. GUI version
+	gvim70ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	gvim70_s.zip	Windows 3.1 GUI version

-You MUST also get the runtime archive (vim74rt.zip).
-The sources are also available (vim74src.zip).
+You MUST also get the runtime archive (vim70rt.zip).
+The sources are also available (vim70src.zip).
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.4 of Vim: Vi IMproved.
+README_dos.txt for version 7.1 of Vim: Vi IMproved.

 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -47,13 +47,13 @@ These are the normal steps to install Vim from the .zip archives:
   Binary and runtime Vim archives are normally unpacked in the same location,
   on top of each other.

-2. Unpack the zip archives.  This will create a new directory "vim\vim74",
+2. Unpack the zip archives.  This will create a new directory "vim\vim70",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim74.zip
-	unzip vim74w32.zip
+	pkunzip -d gvim70.zip
+	unzip vim70w32.zip

   You need to unpack the runtime archive and at least one of the binary
   archives.  When using more than one binary version, be careful not to
@@ -69,7 +69,7 @@ These are the normal steps to install Vim from the .zip archives:
   archive and follow the instructions in the documentation.

 3. Change to the new directory:
-	cd vim\vim74
+	cd vim\vim70
   Run the "install.exe" program.  It will ask you a number of questions about
   how you would like to have your Vim setup.  Among these are:
   - You can tell it to write a "_vimrc" file with your preferences in the
@@ -80,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
     console or in a shell.  You can select one of the directories in your
     $PATH.  If you skip this, you can add Vim to the search path manually:
     The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim74
-	set path=%path%;D:\editors\vim\vim74
+	set path=%path%;C:\vim\vim70
+	set path=%path%;D:\editors\vim\vim70
   - Create entries for Vim on the desktop and in the Start menu.

 That's it!
@@ -93,8 +93,8 @@ Remarks:
  won't show a menubar.  Then you need to set the $VIM environment variable to
  point to the top directory of your Vim files.  Example:
    set VIM=C:\editors\vim
-  Vim version 7.4 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim74.  See ":help $VIM" for more information.
+  Vim version 6.0 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim70.  See ":help $VIM" for more information.

 - To avoid confusion between distributed files of different versions and your
  own modified vim scripts, it is recommended to use this directory layout:
@@ -105,14 +105,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim74\vim.exe		The Vim version 7.4 executable.
-	C:\vim\vim74\doc\*.txt		The version 7.4 documentation files.
-	C:\vim\vim74\bugreport.vim	A Vim version 7.4 script.
-	C:\vim\vim74\...		Other version 7.4 distributed files.
+	C:\vim\vim70\vim.exe		The Vim version 6.0 executable.
+	C:\vim\vim70\doc\*.txt		The version 6.0 documentation files.
+	C:\vim\vim70\bugreport.vim	A Vim version 6.0 script.
+	C:\vim\vim70\...		Other version 6.0 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim74".  Don't add
-  "vim74" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim70".  Don't add
+  "vim70" to $VIM, that won't work.

 - You can put your Vim executable anywhere else.  If the executable is not
  with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -136,8 +136,8 @@ Remarks:
     Select Properties.
  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim74\vim.exe
-	C:\command.com /c D:\editors\vim\vim74\vim.exe
+	C:\command.com /c C:\vim\vim70\vim.exe
+	C:\command.com /c D:\editors\vim\vim70\vim.exe
  6. Select the font, window size, etc. that you like.  If this isn't
     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
     mode".
@@ -1,51 +1,61 @@
-README_extra.txt for version 7.4 of Vim: Vi IMproved.
+README_extra.txt for version 7.1 of Vim: Vi IMproved.

-These extra files of Vim are for special purposes.  This README explains what
-the files are for.  For general information about Vim, see the "README.txt"
-file.
+The extra archive of Vim is to be used in combination with the source archive
+(vim-7.0-src.tar.gz).  The extra archive is useless without it.
+
+For more information, see the "README.txt" file that comes with the runtime
+archive (vim-7.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive too!
+
+The extra archive plus the source and runtime achives make up the complete
+sources of Vim for all systems.


-farsi/*			Files for the Farsi (persian) language.  If you don't
-			know what Farsi is, this is not for you.
+Some of the things that the extra archive contains:

-src/if_sniff.*		Interface to SNiFF.  If you don't know what SNiFF is,
-			this is not for you.
+Farsi		Files for the Farsi (persian) language.  If you don't know
+		what Farsi is, this is not for you.

-src/os_amiga.*		Files for the Amiga port.
+if_sniff	Interface to SNiFF.  If you don't know what SNiFF is, this is
+		not for you.

-src/gui_beos.*
-src/os_beos.*		Files for the BeOS port.
+os_amiga	Files for the Amiga port.

-src/os_msdos.*
-src/os_dos.*		Files for the MS-DOS port.
+gui_riscos
+os_riscos	Files for the RISC OS port.

-src/gui_mac.*
-src/os_mac.*		Files for the Mac port.
+gui_beos
+os_beos		Files for the BeOS port.

-src/os_mint.8		Files for the Atari Mint port.
+os_msdos
+os_dos		Files for the MS-DOS port.

-src/os_os2*		Files for the OS/2 port.
-src/tee/*		Extra program for OS/2.
+gui_mac
+os_mac		Files for the Mac port.

-src/os_vms*		Files for the VMS port.
+os_mint		Files for the Atari Mint port.

-src/os_w32*
-src/os_win32.*		Files for the Win32 port.
+os_os2		Files for the OS/2 port.
+tee		Extra program for OS/2.

-src/gui_w32.*		Files for the Win32 GUI.
-src/gui_w48.*		Files for the Win32 and Win16 GUI.
-src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
-runtime/rgb.txt		File with color definitions for the Win32 GUI.
+os_vms		Files for the VMS port.

-src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
+os_w32
+os_win32	Files for the Win32 port.

-src/VisVim/*		Integration of Win32 GUI with MS Visual Developer
-			Studio.
+gui_w32		Files for the Win32 GUI.
+gui_w48		Files for the Win32 and Win16 GUI.
+Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
+rgb.txt		File with color definitions for the Win32 GUI.

-src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
+if_ole		OLE automation interface, for MS Windows 95 and NT.

-nsis/*			NSIS script to build the self-installing MS-Windows exe
+VisVim		Integration of Win32 GUI with MS Visual Developer Studio.

-runtime/doc/*.man	Preprocessed manual pages.
+GvimExt		DLL for the "Edit with Vim" context menu entry

-runtime/macros/file_select.vim	Vim script to browse directories (Unix only).
+nsis		NSIS script to build the self-installing MS-Windows exe
+
+*.man		Preprocessed manual pages.
+
+file_select.vim	Vim script to browse directories (Unix only).
@@ -0,0 +1,5 @@
+README_lang.txt for version 7.1 of Vim: Vi IMproved.
+
+This file contains files for non-English languages:
+- Translated messages.
+- Translated menus.
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.4 of Vim: Vi IMproved.
+README_mac.txt for version 7.1 of Vim: Vi IMproved.

 This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.4 of Vim: Vi IMproved.
+README_ole.txt for version 7.1 of Vim: Vi IMproved.

 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you
@@ -16,5 +16,5 @@ Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
 For further information, type this inside Vim:
 	:help if_ole

-Furthermore, this archive contains VISVIM.DLL.  It can be used to integrate
+Futhermore, this archive contains VISVIM.DLL.  It can be used to integrate
 the OLE gvim with Microsoft Visual Developer Studio.  See VisVim/README.txt.
@@ -1,32 +1,32 @@
-README_os2.txt for version 7.4 of Vim: Vi IMproved.
+README_os2.txt for version 7.1 of Vim: Vi IMproved.

 This file explains the installation of Vim on OS/2 systems.
 See "README.txt" for general information about Vim.


 NOTE: You will need two archives:
-  vim74rt.zip	contains the runtime files (same as for the PC version)
-  vim74os2.zip	contains the OS/2 executables
+  vim71rt.zip	contains the runtime files (same as for the PC version)
+  vim71os2.zip	contains the OS/2 executables

 1. Go to the directory where you want to put the Vim files.  Examples:
 	cd C:\
 	cd D:\editors

-2. Unpack the zip archives.  This will create a new directory "vim/vim74",
+2. Unpack the zip archives.  This will create a new directory "vim/vim71",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d vim74os2.zip
-	unzip vim74os2.zip
+	pkunzip -d vim71os2.zip
+	unzip vim71os2.zip

   After you unpacked the files, you can still move the whole directory tree
   to another location.

 3. Add the directory where vim.exe is to your path.  The simplest is to add a
   line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim74
-	set path=%path%;D:\editors\vim\vim74
+	set path=%path%;C:\vim\vim71
+	set path=%path%;D:\editors\vim\vim71

 That's it!

@@ -41,10 +41,10 @@ Extra remarks:
 	C:\vim\_viminfo			Dynamic info for 'viminfo'.
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim74\vim.exe		The Vim version 7.4 executable.
-	C:\vim\vim74\doc\*.txt		The version 7.4 documentation files.
-	C:\vim\vim74\bugreport.vim	A Vim version 7.4 script.
-	C:\vim\vim74\...		Other version 7.4 distributed files.
+	C:\vim\vim71\vim.exe		The Vim version 7.1 executable.
+	C:\vim\vim71\doc\*.txt		The version 7.1 documentation files.
+	C:\vim\vim71\bugreport.vim	A Vim version 7.1 script.
+	C:\vim\vim71\...		Other version 7.1 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim

@@ -1,84 +1,51 @@
-README_zOS.txt for version 7.4 of Vim: Vi IMproved.
+README_os_390.txt for version 7.1 of Vim: Vi IMproved.

-This readme explains how to build Vim on z/OS.  Formerly called OS/390.
-See "README.txt" for general information about Vim.
+Welcome to the OS/390 Unix port of VIM.

-Most likely there are not many users out there using Vim on z/OS. So chances
-are good, that some bugs are still undiscovered.
+ATTENTION: THIS IS AN _ALPHA_ VERSION!!!
+I expect you to know how to handle alpha software!

-Getting the source to z/OS:
-==========================
+This port was done by Ralf Schandl <schandl@de.ibm.com>.
+This port is not maintained or supported by IBM!!

-First get the source code in one big tar file and ftp it a binary to z/OS. If
-the tar file is initially compressed with gzip (tar.gz) or bzip2 (tar.bz2)
-uncompress it on your PC, as this tools are (most likely) not available on the
-mainframe.

-To reduce the size of the tar file you might compress it into a zip file. On
-z/OS Unix you might have the command "jar" from java to uncompress a zip. Use:
-        jar xvf <zip file name>
-
-Unpack the tar file on z/OS with 
-        pax -o from=ISO8859-1,to=IBM-1047 -rf vim.tar
-
-Note: The Vim source contains a few bitmaps etc which will be destroyed by
-this command, but these files are not needed on zOS (at least not for the
-console version).
+For the list of changes see runtime/doc/os_390.txt.


 Compiling:
-==========
+----------

-Vim can be compiled with or without GUI support. For 7.4 only the compilation
-without GUI was tested. Below is a section about compiling with X11 but this
-is from an earlier version of Vim.
+Note: After the file configure was created via autoconf, it had been
+      handedited, to make the test for ICEConnectionNumber work.
+      DO NOT run autoconf again!

-Console only:
-------------
+Without X11:

 If you build VIM without X11 support, compiling and building is nearly
-straightforward. 
-
-Change to the vim directory and do:
+straightforward. The only restriction is, that you can't call make from the
+VIM toplevel directory. Change to the src directory first and call make from
+there. Here is a what to do:

    # Don't use c89!
+    # Make additional symbols visible.
    # Allow intermixing of compiler options and files.

    $ export CC=cc
+    $ export CFLAGS=-D_ALL_SOURCE
    $ export _CC_CCMODE=1
-    $./configure --with-features=big --without-x --enable-gui=no
+    $./configure --enable-max-features --without-x --enable-gui=no
    $ cd src
    $ make
-
-      There may be warnings:
-        - include files not found (libc, sys/param.h, ...)
-        - Redeclaration of ... differs from ...
-        -- just ignore them.
-
    $ make test

-      This will produce lots of garbage on your screen (including error
-      messages). Don't worry.
-
-      If the test stops at one point in vim (might happen in test 11), just
-      press :q!
-
-      Expected test failures:
-        11: If you don't have gzip installed
-        24: test of backslash sequences in regexp are ASCII dependent
-        42: Multibyte is not supported on z/OS
-        55: ASCII<->EBCDIC sorting
-        57: ASCII<->EBCDIC sorting
-        58: Spell checking is not supported with EBCDIC
-        71: Blowfish encryption doesn't work
+      Note: Test 28 will be reported as failed. This is because diff can't
+	    compare files containing '\0' characters. Test 11 will fail if you
+	    don't have gzip.

    $ make install


 With X11:
---------
-
-WARNING: This instruction was not tested with Vim 7.4.

 There are two ways for building VIM with X11 support. The first way is simple
 and results in a big executable (~13 Mb), the second needs a few additional
@@ -87,6 +54,8 @@ you want Motif.

  The easy way:
    $ export CC=cc
+    $ export CFLAGS="-D_ALL_SOURCE -W c,dll"
+    $ export LDFLAGS="-W l,dll"
    $ export _CC_CCMODE=1
    $ ./configure --enable-max-features --enable-gui=motif
    $ cd src
@@ -96,7 +65,7 @@ you want Motif.

  The smarter way:
    Make VIM as described above. Then create a file named 'link.sed' with the
-    following content (see src/link.390):
+    following contense:

 	s/-lXext  *//g
 	s/-lXmu  *//g
@@ -115,3 +84,47 @@ you want Motif.
    See the Makefile and the file link.sh on how link.sed is used.


+Hint:
+-----
+Use the online help! (See weaknesses below.)
+
+Example:
+Enter ':help syntax' and then press <TAB> several times, you will switch
+through all help items containing 'syntax'. Press <ENTER> on the one you are
+interested at. Or press <Ctrl-D> and you will get a list of all items printed
+that contain 'syntax'.
+
+The helpfiles contains cross-references. Links are between '|'. Position the
+cursor on them and press <Ctrl-]> to follow this link. Use <Ctrl-T> to jump
+back.
+
+Known weaknesses:
+-----------------
+
+- You can't call make from the toplevel directory, you have to do a 'cd src'
+  first.  If you do it, make will call configure again. I don't know why and
+  didn't investigate it, there were more important things to do. If you can
+  make it work drop me a note.
+
+- The documentation was not updated for this alpha release. It contains lot of
+  ASCII dependencies, especially in examples.
+
+- Digraphs are dependent on code page 1047. Digraphs are used to enter
+  characters that normally cannot be entered by an ordinary keyboard.
+  See ":help digraphs".
+
+- Using 'ga' to show the code of the character under the cursor shows the
+  correct dec/hex/oct values, but the other informations might be missing or
+  wrong.
+
+- The sed syntax file doesn't work, it is ASCII dependent.
+
+Bugs:
+-----
+If you find a bug please inform me (schandl@de.ibm.com), don't disturb Bram
+Moolenaar. It's most likely a bug I introduced during porting or some ASCII
+dependency I didn't notice.
+
+Feedback:
+---------
+Feedback welcome! Just drop me a note.
@@ -1,8 +1,10 @@
-README_src.txt for version 7.4 of Vim: Vi IMproved.
+README_src.txt for version 7.1 of Vim: Vi IMproved.

 The source archive contains the files needed to compile Vim on Unix systems.
-It is packed for Unix systems (NL line separator).
+It is packed for Unix systems (NL line separator).  It is also used for other
+systems in combination with the extra archive (vim-7.0-extra.tar.gz, in the
+"extra" directory of ftp.vim.org).

 For more information, see the README.txt file that comes with the runtime
-archive (vim-7.4-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-7.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
@@ -1,8 +1,8 @@
-README_srcdos.txt for version 7.4 of Vim: Vi IMproved.
+README_srcdos.txt for version 7.1 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim74rt.zip).
+These files are in the runtime archive (vim70rt.zip).


 The DOS source archive contains the files needed to compile Vim on MS-DOS or
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.4 of Vim: Vi IMproved.
+README_unix.txt for version 7.1 of Vim: Vi IMproved.

 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.4 of Vim: Vi IMproved.
+README_vms.txt for version 7.1 of Vim: Vi IMproved.

 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.4 of Vim: Vi IMproved.
+README_w32s.txt for version 7.1 of Vim: Vi IMproved.

 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.
@@ -1,11 +1,11 @@
 # NSIS file to create a self-installing exe for Vim.
 # It requires NSIS version 2.0 or later.
-# Last Change:	2010 Jul 30
+# Last change:	2004 May 02

 # WARNING: if you make changes to this script, look out for $0 to be valid,
 # because uninstall deletes most files in $0.

-# Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc.
+# Location of gvim_ole.exe, vimd32.exe, GvimExt/*, etc.
 !define VIMSRC "..\src"

 # Location of runtime files
@@ -22,25 +22,22 @@
 !define HAVE_NLS

 !define VER_MAJOR 7
-!define VER_MINOR 4
+!define VER_MINOR 1

 # ----------- No configurable settings below this line -----------

 !include UpgradeDLL.nsh		# for VisVim.dll
-!include LogicLib.nsh
-!include x64.nsh

 Name "Vim ${VER_MAJOR}.${VER_MINOR}"
 OutFile gvim${VER_MAJOR}${VER_MINOR}.exe
 CRCCheck force
 SetCompressor lzma
 SetDatablockOptimize on
-RequestExecutionLevel highest

 ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
 DirText "Choose a directory to install Vim (must end in 'vim')"
 Icon icons\vim_16c.ico
-# NSIS2 uses a different strategy with six different images in a strip...
+# NSIS2 uses a different strategy with six diferent images in a strip...
 #EnabledBitmap icons\enabled.bmp
 #DisabledBitmap icons\disabled.bmp
 UninstallText "This will uninstall Vim ${VER_MAJOR}.${VER_MINOR} from your system."
@@ -56,9 +53,6 @@ LicenseData ${VIMRT}\doc\uganda.nsis.txt
  !packhdr temp.dat "upx --best --compress-icons=1 temp.dat"
 !endif

-SetCompressor /SOLID lzma
-XPStyle on
-
 # This adds '\vim' to the user choice automagically.  The actual value is
 # obtained below with ReadINIStr.
 InstallDir "$PROGRAMFILES\Vim"
@@ -145,7 +139,7 @@ FunctionEnd
 Function .onInstSuccess
  WriteUninstaller vim${VER_MAJOR}${VER_MINOR}\uninstall-gui.exe
  MessageBox MB_YESNO|MB_ICONQUESTION \
-	"The installation process has been successful. Happy Vimming! \
+	"The installation process has been successfull. Happy Vimming! \
 	$\n$\n Do you want to see the README file now?" IDNO NoReadme
      Exec '$0\gvim.exe -R "$0\README.txt"'
  NoReadme:
@@ -250,10 +244,11 @@ Section "Vim console program (vim.exe)"
 	ReadRegStr $R0 HKLM \
 	   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
 	IfErrors 0 lbl_winnt
-	    # Windows 95/98/ME: not supported
+	    # Windows 95/98/ME
+	    File /oname=vim.exe ${VIMSRC}\vimd32.exe
 	    Goto lbl_done
 	lbl_winnt:
-	    # Windows NT/2000/XP and later
+	    # Windows NT/2000/XT
 	    File /oname=vim.exe ${VIMSRC}\vimw32.exe
 	lbl_done:
 	StrCpy $2 "$2 vim view vimdiff"
@@ -295,21 +290,13 @@ Section "Add an Edit-with-Vim context menu entry"
 	SetOutPath $0
 	ClearErrors
 	SetOverwrite try
-	${If} ${RunningX64}
-	  File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext64.dll
-	${Else}
-	  File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll
-	${EndIf}
+	File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll
 	IfErrors 0 GvimExtDone

 	# Can't copy gvimext.dll, create it under another name and rename it on
 	# next reboot.
 	GetTempFileName $3 $0
-	${If} ${RunningX64}
-	  File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll
-	${Else}
-	  File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll
-	${EndIf}
+	File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll
 	Rename /REBOOTOK $3 $0\gvimext.dll

 	GvimExtDone:
@@ -451,8 +438,8 @@ Section Uninstall

 	  AskRemove:
 	    MessageBox MB_YESNO|MB_ICONQUESTION \
-	      "Remove all files in your $1\vimfiles directory?$\n \
-	      $\nCAREFUL: If you have created something there that you want to keep, click No" IDNO Fin
+	      "Remove all files in your $1\vimfiles directory? \
+	      $\nIf you have created something there that you want to keep, click No" IDNO Fin
 	    RMDir /r $1\vimfiles
 	  NoRemove:

@@ -1,16 +1,14 @@
 "------------------------------------------------------------------------------
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
-"	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
-"   Maintainer: Martin Krischik <krischik@users.sourceforge.net>
-"		Taylor Venable <taylor@metasyntax.net>
+"	   $Id$
+"   Maintainer: Martin Krischik
 "		Neil Bird <neil@fnxweb.com>
-"		Ned Okie <nokie@radford.edu>
-"      $Author: krischik $
-"	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
-"      Version: 4.6
-"    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
+"      $Author$
+"	 $Date$
+"      Version: 4.2
+"    $Revision$
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK ' should not be in iskeyword.
 "		16.07.2006 MK Ada-Mode as vim-ball
@@ -19,18 +17,12 @@
 "		05.11.2006 MK Bram suggested not to use include protection for
 "			      autoload
 "		05.11.2006 MK Bram suggested to save on spaces
-"		08.07.2007 TV fix mapleader problems.
-"	        09.05.2007 MK Session just won't work no matter how much
-"			      tweaking is done
-"		19.09.2007 NO still some mapleader problems
 "    Help Page: ft-ada-functions
 "------------------------------------------------------------------------------

 if version < 700
   finish
 endif 
-let s:keepcpo= &cpo
-set cpo&vim

 " Section: Constants {{{1
 "
@@ -433,49 +425,30 @@ function ada#Create_Tags (option)
   execute '!ctags --excmd=number ' . l:Filename
 endfunction ada#Create_Tags

-" Section: ada#Switch_Session {{{1
-"
-function ada#Switch_Session (New_Session)
-   " 
-   " you should not save to much date into the seession since they will
-   " be sourced
-   "
-   let l:sessionoptions=&sessionoptions
-
-   try
-      set sessionoptions=buffers,curdir,folds,globals,resize,slash,tabpages,tabpages,unix,winpos,winsize
-
-      if a:New_Session != v:this_session
-	 "
-	 "  We actualy got a new session - otherwise there
-	 "  is nothing to do.
-	 "
-	 if strlen (v:this_session) > 0
-	    execute 'mksession! ' . v:this_session
-	 endif
-
-	 let v:this_session = a:New_Session
-
-	 "if filereadable (v:this_session)
-	    "execute 'source ' . v:this_session
-	 "endif
-
-	 augroup ada_session
-	    autocmd!
-	    autocmd VimLeavePre * execute 'mksession! ' . v:this_session
-	 augroup END
-	 
-	 "if exists ("g:Tlist_Auto_Open") && g:Tlist_Auto_Open
-	    "TlistOpen
-	 "endif
-
+function ada#Switch_Session (New_Session)   "{{{1
+   if a:New_Session != v:this_session
+      "
+      "  We actualy got a new session - otherwise there
+      "  is nothing to do.
+      "
+      if strlen (v:this_session) > 0
+	 execute 'mksession! ' . v:this_session
      endif
-   finally
-      let &sessionoptions=l:sessionoptions
-   endtry
+
+      let v:this_session = a:New_Session
+
+      if filereadable (v:this_session)
+	 execute 'source ' . v:this_session
+      endif
+
+      augroup ada_session
+	 autocmd!
+	 autocmd VimLeavePre * execute 'mksession! ' . v:this_session
+      augroup END
+   endif

   return
-endfunction ada#Switch_Session	
+endfunction ada#Switch_Session	 "}}}1

 " Section: GNAT Pretty Printer folding {{{1
 "
@@ -573,23 +546,18 @@ function ada#Map_Menu (Text, Keys, Command)
 	\ a:Keys		 .
 	\" <C-O>:" . a:Command . "<CR>"
   else
-      if exists("g:mapleader")
-         let l:leader = g:mapleader
-      else
-         let l:leader = '\'
-      endif
      execute
 	\ "50amenu " .
 	\ "Ada."  . escape(a:Text, ' ') .
-	\ "<Tab>" . escape(l:leader . "a" . a:Keys , '\') .
+	\ "<Tab>" . escape(g:mapleader . "a" . a:Keys , '\') .
 	\ " :"	  . a:Command . "<CR>"
      execute
 	\ "nnoremap <buffer>" .
-	\ escape(l:leader . "a" . a:Keys , '\') .
+	\ escape(g:mapleader . "a" . a:Keys , '\') .
 	\" :" . a:Command
      execute
 	\ "inoremap <buffer>" .
-	\ escape(l:leader . "a" . a:Keys , '\') .
+	\ escape(g:mapleader . "a" . a:Keys , '\') .
 	\" <C-O>:" . a:Command
   endif
   return
@@ -598,15 +566,10 @@ endfunction
 " Section: ada#Map_Popup {{{2
 "
 function ada#Map_Popup (Text, Keys, Command)
-   if exists("g:mapleader")
-      let l:leader = g:mapleader
-   else
-      let l:leader = '\'
-   endif
   execute
     \ "50amenu " .
     \ "PopUp."   . escape(a:Text, ' ') .
-     \ "<Tab>"	  . escape(l:leader . "a" . a:Keys , '\') .
+     \ "<Tab>"	  . escape(g:mapleader . "a" . a:Keys , '\') .
     \ " :"	  . a:Command . "<CR>"

   call ada#Map_Menu (a:Text, a:Keys, a:Command)
@@ -621,9 +584,6 @@ lockvar  g:ada#Comment
 lockvar! g:ada#Keywords
 lockvar! g:ada#Ctags_Kinds

-let &cpo = s:keepcpo
-unlet s:keepcpo
-
 finish " 1}}}

 "------------------------------------------------------------------------------
@@ -1,13 +1,13 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada omnicompletion file
 "     Language:	Ada (2005)
-"	   $Id: adacomplete.vim 887 2008-07-08 14:29:01Z krischik $
+"	   $Id$
 "   Maintainer:	Martin Krischik
-"      $Author: krischik $
-"	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
-"      Version: 4.6
-"    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
+"      $Author$
+"	 $Date$
+"      Version: 4.2
+"    $Revision$
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK improved search for begin of word.
 "		16.07.2006 MK Ada-Mode as vim-ball
@@ -1,10 +1,8 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Jun 20
+" Last Change:	2006 May 08

-let s:cpo_save = &cpo
-set cpo&vim

 " This function is used for the 'omnifunc' option.
 function! ccomplete#Complete(findstart, base)
@@ -121,27 +119,6 @@ function! ccomplete#Complete(findstart, base)
    " TODO: join previous line if it makes sense
    let line = getline('.')
    let col = col('.')
-    if stridx(strpart(line, 0, col), ';') != -1
-      " Handle multiple declarations on the same line.
-      let col2 = col - 1
-      while line[col2] != ';'
-	let col2 -= 1
-      endwhile
-      let line = strpart(line, col2 + 1)
-      let col -= col2
-    endif
-    if stridx(strpart(line, 0, col), ',') != -1
-      " Handle multiple declarations on the same line in a function
-      " declaration.
-      let col2 = col - 1
-      while line[col2] != ','
-	let col2 -= 1
-      endwhile
-      if strpart(line, col2 + 1, col - col2 - 1) =~ ' *[^ ][^ ]*  *[^ ]'
-	let line = strpart(line, col2 + 1)
-	let col -= col2
-      endif
-    endif
    if len(items) == 1
      " Completing one word and it's a local variable: May add '[', '.' or
      " '->'.
@@ -500,7 +477,7 @@ function! s:StructMembers(typename, items, all)
  endif
  if !cached
    while 1
-      exe 'silent! keepj noautocmd ' . n . 'vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames
+      exe 'silent! ' . n . 'vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames

      let qflist = getqflist()
      if len(qflist) > 0 || match(typename, "::") < 0
@@ -605,6 +582,3 @@ function! s:SearchMembers(matches, items, all)
  endfor
  return res
 endfunc
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -1,14 +1,14 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada/Dec Ada compiler file
 "     Language: Ada (Dec Ada)
-"          $Id: decada.vim 887 2008-07-08 14:29:01Z krischik $
+"          $Id$
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischik <krischik@users.sourceforge.net>
-"      $Author: krischik $
-"        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
-"      Version: 4.6      
-"    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
+"   Maintainer:	Martin Krischik
+"      $Author$
+"        $Date$
+"      Version: 4.2
+"    $Revision$
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
 "      History: 21.07.2006 MK New Dec Ada
 "               15.10.2006 MK Bram's suggestion for runtime integration
 "               05.11.2006 MK Bram suggested not to use include protection for
@@ -45,7 +45,7 @@ function decada#Set_Session (...) dict				     " {{{1
      call ada#Switch_Session (a:1)
   elseif argc() == 0 && strlen (v:servername) > 0
      call ada#Switch_Session (
-	 \ expand('~')[0:-2] . ".vimfiles.session]decada_" .
+	 \ expand('~')[0:-2] . ".vimfiles.session]" .
 	 \ v:servername . ".vim")
   endif
   return
@@ -1,8 +1,8 @@
 " ---------------------------------------------------------------------
 " getscript.vim
-"  Author:	Charles E. Campbell
-"  Date:	Apr 17, 2013
-"  Version:	35
+"  Author:	Charles E. Campbell, Jr.
+"  Date:	May 11, 2007
+"  Version:	27
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
 "
@@ -11,42 +11,23 @@
 " ---------------------------------------------------------------------
 " Initialization:	{{{1
 " if you're sourcing this file, surely you can't be
-" expecting vim to be in its vi-compatible mode!
-if exists("g:loaded_getscript")
- finish
-endif
-let g:loaded_getscript= "v35"
+" expecting vim to be in its vi-compatible mode
 if &cp
 echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
 finish
 endif
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of getscript needs vim 7.2"
- echohl Normal
- finish
-endif
 let s:keepcpo = &cpo
 set cpo&vim
 "DechoTabOn

-" ---------------------------
-" Global Variables: {{{1
-" ---------------------------
-" Cygwin Detection ------- {{{2
-if !exists("g:getscript_cygwin")
- if has("win32") || has("win95") || has("win64") || has("win16")
-  if &shell =~ '\%(\<bash\>\|\<zsh\>\)\%(\.exe\)\=$'
-   let g:getscript_cygwin= 1
-  else
-   let g:getscript_cygwin= 0
-  endif
- else
-  let g:getscript_cygwin= 0
- endif
+if exists("g:loaded_getscript")
+ finish
 endif
+let g:loaded_getscript= "v27"

-" wget vs curl {{{2
+" ---------------------------------------------------------------------
+"  Global Variables: {{{1
+" allow user to change the command for obtaining scripts (does fetch work?)
 if !exists("g:GetLatestVimScripts_wget")
 if executable("wget")
  let g:GetLatestVimScripts_wget= "wget"
@@ -74,11 +55,6 @@ if !exists("g:GetLatestVimScripts_allowautoinstall")
 let g:GetLatestVimScripts_allowautoinstall= 1
 endif

-" set up default scriptaddr address
-if !exists("g:GetLatestVimScripts_scriptaddr")
- let g:GetLatestVimScripts_scriptaddr = 'http://vim.sourceforge.net/script.php?script_id='
-endif
-
 "" For debugging:
 "let g:GetLatestVimScripts_wget    = "echo"
 "let g:GetLatestVimScripts_options = "options"
@@ -103,9 +79,7 @@ if g:GetLatestVimScripts_allowautoinstall
  endif
 endif

- if exists("g:GetLatestVimScripts_autoinstalldir") && isdirectory(g:GetLatestVimScripts_autoinstalldir)
-  let s:autoinstall= g:GetLatestVimScripts_autoinstalldir"
- elseif exists('$HOME') && isdirectory(expand("$HOME")."/".s:dotvim)
+ if exists('$HOME') && isdirectory(expand("$HOME")."/".s:dotvim)
  let s:autoinstall= $HOME."/".s:dotvim
 endif
 " call Decho("s:autoinstall<".s:autoinstall.">")
@@ -119,6 +93,262 @@ com!        -nargs=0 GetLatestVimScripts call getscript#GetLatestVimScripts()
 com!        -nargs=0 GetScript           call getscript#GetLatestVimScripts()
 silent! com -nargs=0 GLVS                call getscript#GetLatestVimScripts()

+" ---------------------------------------------------------------------
+"  GetOneScript: (Get Latest Vim Script) this function operates {{{1
+"    on the current line, interpreting two numbers and text as
+"    ScriptID, SourceID, and Filename.
+"    It downloads any scripts that have newer versions from vim.sf.net.
+fun! s:GetOneScript(...)
+"   call Dfunc("GetOneScript()")
+
+ " set options to allow progress to be shown on screen
+  let t_ti= &t_ti
+  let t_te= &t_te
+  let rs  = &rs
+  set t_ti= t_te= nors
+
+ " put current line on top-of-screen and interpret it into
+ " a      script identifer  : used to obtain webpage
+ "        source identifier : used to identify current version
+ " and an associated comment: used to report on what's being considered
+  if a:0 >= 3
+   let scriptid = a:1
+   let srcid    = a:2
+   let fname    = a:3
+   let cmmnt    = ""
+"   call Decho("scriptid<".scriptid.">")
+"   call Decho("srcid   <".srcid.">")
+"   call Decho("fname   <".fname.">")
+  else
+   let curline  = getline(".")
+   if curline =~ '^\s*#'
+"    call Dret("GetOneScript : skipping a pure comment line")
+    return
+   endif
+   let parsepat = '^\s*\(\d\+\)\s\+\(\d\+\)\s\+\(.\{-}\)\(\s*#.*\)\=$'
+   try
+    let scriptid = substitute(curline,parsepat,'\1','e')
+   catch /^Vim\%((\a\+)\)\=:E486/
+    let scriptid= 0
+   endtry
+   try
+    let srcid    = substitute(curline,parsepat,'\2','e')
+   catch /^Vim\%((\a\+)\)\=:E486/
+    let srcid= 0
+   endtry
+   try
+    let fname= substitute(curline,parsepat,'\3','e')
+   catch /^Vim\%((\a\+)\)\=:E486/
+    let fname= ""
+   endtry
+   try
+    let cmmnt= substitute(curline,parsepat,'\4','e')
+   catch /^Vim\%((\a\+)\)\=:E486/
+    let cmmnt= ""
+   endtry
+"   call Decho("curline <".curline.">")
+"   call Decho("parsepat<".parsepat.">")
+"   call Decho("scriptid<".scriptid.">")
+"   call Decho("srcid   <".srcid.">")
+"   call Decho("fname   <".fname.">")
+  endif
+
+  if scriptid == 0 || srcid == 0
+   " When looking for :AutoInstall: lines, skip scripts that
+   " have  0 0 scriptname
+"   call Dret("GetOneScript : skipping a scriptid==srcid==0 line")
+   return
+  endif
+
+  let doautoinstall= 0
+  if fname =~ ":AutoInstall:"
+"   call Decho("fname<".fname."> has :AutoInstall:...")
+   let aicmmnt= substitute(fname,'\s\+:AutoInstall:\s\+',' ','')
+"   call Decho("aicmmnt<".aicmmnt."> s:autoinstall=".s:autoinstall)
+   if s:autoinstall != ""
+    let doautoinstall = g:GetLatestVimScripts_allowautoinstall
+   endif
+  else
+   let aicmmnt= fname
+  endif
+"  call Decho("aicmmnt<".aicmmnt.">: doautoinstall=".doautoinstall)
+
+  exe "norm z\<CR>"
+  redraw!
+"  call Decho('considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid)
+  echomsg 'considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid
+
+  " grab a copy of the plugin's vim.sf.net webpage
+  let scriptaddr = 'http://vim.sf.net/script.php?script_id='.scriptid
+  let tmpfile    = tempname()
+  let v:errmsg   = ""
+
+  " make up to three tries at downloading the description
+  let itry= 1
+  while itry <= 3
+"   	call Decho("try#".itry." to download description of <".aicmmnt."> with addr=".scriptaddr)
+  	if has("win32") || has("win16") || has("win95")
+"     call Decho("silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".tmpfile.' "'.scriptaddr.'"')
+     exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".tmpfile.' "'.scriptaddr.'"'
+	else
+"     call Decho("silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".tmpfile." '".scriptaddr."'")
+     exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".tmpfile." '".scriptaddr."'"
+	endif
+	if itry == 1
+    exe "silent vsplit ".tmpfile
+	else
+	 silent! e %
+	endif
+  
+   " find the latest source-id in the plugin's webpage
+   silent! 1
+   let findpkg= search('Click on the package to download','W')
+   if findpkg > 0
+    break
+   endif
+   let itry= itry + 1
+  endwhile
+"  call Decho(" --- end downloading tries while loop --- itry=".itry)
+
+  " testing: did finding "Click on the package..." fail?
+  if findpkg == 0 || itry >= 4
+    silent q!
+    call delete(tmpfile)
+   " restore options
+    let &t_ti        = t_ti
+    let &t_te        = t_te
+    let &rs          = rs
+    let s:downerrors = s:downerrors + 1
+"    call Decho("***warning*** couldn'".'t find "Click on the package..." in description page for <'.aicmmnt.">")
+    echomsg "***warning*** couldn'".'t find "Click on the package..." in description page for <'.aicmmnt.">"
+"    call Dret("GetOneScript : srch for /Click on the package/ failed")
+    return
+  endif
+"  call Decho('found "Click on the package to download"')
+
+  let findsrcid= search('src_id=','W')
+  if findsrcid == 0
+    silent q!
+    call delete(tmpfile)
+   " restore options
+	let &t_ti        = t_ti
+	let &t_te        = t_te
+	let &rs          = rs
+	let s:downerrors = s:downerrors + 1
+"  	call Decho("***warning*** couldn'".'t find "src_id=" in description page for <'.aicmmnt.">")
+  	echomsg "***warning*** couldn'".'t find "src_id=" in description page for <'.aicmmnt.">"
+"	call Dret("GetOneScript : srch for /src_id/ failed")
+  	return
+  endif
+"  call Decho('found "src_id=" in description page')
+
+  let srcidpat   = '^\s*<td class.*src_id=\(\d\+\)">\([^<]\+\)<.*$'
+  let latestsrcid= substitute(getline("."),srcidpat,'\1','')
+  let sname      = substitute(getline("."),srcidpat,'\2','') " script name actually downloaded
+"  call Decho("srcidpat<".srcidpat."> latestsrcid<".latestsrcid."> sname<".sname.">")
+  silent q!
+  call delete(tmpfile)
+
+  " convert the strings-of-numbers into numbers
+  let srcid       = srcid       + 0
+  let latestsrcid = latestsrcid + 0
+"  call Decho("srcid=".srcid." latestsrcid=".latestsrcid." sname<".sname.">")
+
+  " has the plugin's most-recent srcid increased, which indicates
+  " that it has been updated
+  if latestsrcid > srcid
+"   call Decho("[latestsrcid=".latestsrcid."] <= [srcid=".srcid."]: need to update <".sname.">")
+
+   let s:downloads= s:downloads + 1
+   if sname == bufname("%")
+    " GetLatestVimScript has to be careful about downloading itself
+    let sname= "NEW_".sname
+   endif
+
+   " the plugin has been updated since we last obtained it, so download a new copy
+"   call Decho("...downloading new <".sname.">")
+   echomsg "...downloading new <".sname.">"
+   if has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")
+"    call Decho("windows: silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".sname.' "'.'http://vim.sf.net/scripts/download_script.php?src_id='.latestsrcid.'"')
+    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".sname.' "'.'http://vim.sf.net/scripts/download_script.php?src_id='.latestsrcid.'"'
+   else
+"    call Decho("unix: silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".sname." '".'http://vim.sf.net/scripts/download_script.php?src_id='.latestsrcid."'")
+    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".sname." '".'http://vim.sf.net/scripts/download_script.php?src_id='.latestsrcid."'"
+   endif
+
+   " AutoInstall: only if doautoinstall is so indicating
+   if doautoinstall
+"     call Decho("attempting to do autoinstall: getcwd<".getcwd()."> filereadable(".sname.")=".filereadable(sname))
+     if filereadable(sname)
+"       call Decho("move <".sname."> to ".s:autoinstall)
+       exe "silent !".g:GetLatestVimScripts_mv." ".sname." ".s:autoinstall
+       let curdir= escape(substitute(getcwd(),'\','/','ge'),"|[]*'\" #")
+"       call Decho("exe cd ".s:autoinstall)
+       exe "cd ".s:autoinstall
+      
+       " decompress
+       if sname =~ '\.bz2$'
+"         call Decho("decompress: attempt to bunzip2 ".sname)
+         exe "silent !bunzip2 ".sname
+         let sname= substitute(sname,'\.bz2$','','')
+"         call Decho("decompress: new sname<".sname."> after bunzip2")
+       elseif sname =~ '\.gz$'
+"         call Decho("decompress: attempt to gunzip ".sname)
+         exe "silent !gunzip ".sname
+         let sname= substitute(sname,'\.gz$','','')
+"         call Decho("decompress: new sname<".sname."> after gunzip")
+       endif
+      
+       " distribute archive(.zip, .tar, .vba) contents
+       if sname =~ '\.zip$'
+"         call Decho("dearchive: attempt to unzip ".sname)
+         exe "silent !unzip -o ".sname
+       elseif sname =~ '\.tar$'
+"         call Decho("dearchive: attempt to untar ".sname)
+         exe "silent !tar -xvf ".sname
+       elseif sname =~ '\.vba$'
+"         call Decho("dearchive: attempt to handle a vimball: ".sname)
+         silent 1split
+         exe "silent e ".sname
+         silent so %
+         silent q
+       endif
+      
+       if sname =~ '.vim$'
+"         call Decho("dearchive: attempt to simply move ".sname." to plugin")
+         exe "silent !".g:GetLatestVimScripts_mv." ".sname." plugin"
+       endif
+      
+       " helptags step
+       let docdir= substitute(&rtp,',.*','','e')."/doc"
+"       call Decho("helptags: docdir<".docdir.">")
+       exe "helptags ".docdir
+       exe "cd ".curdir
+     endif
+     if fname !~ ':AutoInstall:'
+      let modline=scriptid." ".latestsrcid." :AutoInstall: ".fname.cmmnt
+     else
+      let modline=scriptid." ".latestsrcid." ".fname.cmmnt
+     endif
+   else
+     let modline=scriptid." ".latestsrcid." ".fname.cmmnt
+   endif
+
+   " update the data in the <GetLatestVimScripts.dat> file
+   call setline(line("."),modline)
+"   call Decho("update data in ".expand("%")."#".line(".").": modline<".modline.">")
+"  else " Decho
+"   call Decho("[latestsrcid=".latestsrcid."] <= [srcid=".srcid."], no need to update")
+  endif
+
+ " restore options
+  let &t_ti= t_ti
+  let &t_te= t_te
+  let &rs  = rs
+
+"  call Dret("GetOneScript")
+endfun
+
 " ---------------------------------------------------------------------
 " GetLatestVimScripts: this function gets the latest versions of {{{1
 "                      scripts based on the list in
@@ -133,12 +363,6 @@ fun! getscript#GetLatestVimScripts()
   return
  endif

-  " insure that fnameescape() is available
-  if !exists("*fnameescape")
-   echoerr "GetLatestVimScripts needs fnameescape() (provided by 7.1.299 or later)"
-   return
-  endif
-
  " Find the .../GetLatest subdirectory under the runtimepath
  for datadir in split(&rtp,',') + ['']
   if isdirectory(datadir."/GetLatest")
@@ -158,6 +382,7 @@ fun! getscript#GetLatestVimScripts()
 "   call Dret("GetLatestVimScripts : unable to find a GetLatest subdirectory")
   return
  endif
+
  if filewritable(datadir) != 2
   echoerr "(getLatestVimScripts) Your ".datadir." isn't writable"
 "   call Dret("GetLatestVimScripts : non-writable directory<".datadir.">")
@@ -174,30 +399,19 @@ fun! getscript#GetLatestVimScripts()
 "   call Dret("GetLatestVimScripts : non-writable datafile<".datafile.">")
   return
  endif
-  " --------------------
-  " Passed sanity checks
-  " --------------------
-
 "  call Decho("datadir  <".datadir.">")
 "  call Decho("datafile <".datafile.">")

-  " don't let any event handlers interfere (like winmanager's, taglist's, etc)
-  let eikeep  = &ei
-  let hlskeep = &hls
-  let acdkeep = &acd
-  set ei=all hls&vim noacd
+  " don't let any events interfere (like winmanager's, taglist's, etc)
+  let eikeep= &ei
+  set ei=all

-  " Edit the datafile (ie. GetLatestVimScripts.dat):
-  " 1. record current directory (origdir),
-  " 2. change directory to datadir,
-  " 3. split window
-  " 4. edit datafile
+  " record current directory, change to datadir, open split window with
+  " datafile
  let origdir= getcwd()
-"  call Decho("exe cd ".fnameescape(substitute(datadir,'\','/','ge')))
-  exe "cd ".fnameescape(substitute(datadir,'\','/','ge'))
+  exe "cd ".escape(substitute(datadir,'\','/','ge'),"|[]*'\" #")
  split
-"  call Decho("exe  e ".fnameescape(substitute(datafile,'\','/','ge')))
-  exe "e ".fnameescape(substitute(datafile,'\','/','ge'))
+  exe "e ".escape(substitute(datafile,'\','/','ge'),"|[]*'\" #")
  res 1000
  let s:downloads = 0
  let s:downerrors= 0
@@ -207,85 +421,78 @@ fun! getscript#GetLatestVimScripts()
 "  call Decho("searching plugins for GetLatestVimScripts dependencies")
  let lastline    = line("$")
 "  call Decho("lastline#".lastline)
-  let firstdir    = substitute(&rtp,',.*$','','')
-  let plugins     = split(globpath(firstdir,"plugin/*.vim"),'\n')
-  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/*.vim"),'\n')
+  let plugins     = split(globpath(&rtp,"plugin/*.vim"))
  let foundscript = 0
+  let firstdir= ""

-  " this loop updates the GetLatestVimScripts.dat file
-  " with dependencies explicitly mentioned in the plugins
-  " via   GetLatestVimScripts: ... lines
-  " It reads the plugin script at the end of the GetLatestVimScripts.dat
-  " file, examines it, and then removes it.
  for plugin in plugins
-"   call Decho(" ")
-"   call Decho("plugin<".plugin.">")
+
+   " don't process plugins in system directories
+   if firstdir == ""
+    let firstdir= substitute(plugin,'[/\\][^/\\]\+$','','')
+"    call Decho("firstdir<".firstdir.">")
+   else
+    let curdir= substitute(plugin,'[/\\][^/\\]\+$','','')
+"    call Decho("curdir<".curdir.">")
+    if curdir != firstdir
+     break
+    endif
+   endif

   " read plugin in
-   " evidently a :r creates a new buffer (the "#" buffer) that is subsequently unused -- bwiping it
   $
+"   call Decho(" ")
 "   call Decho(".dependency checking<".plugin."> line$=".line("$"))
-"   call Decho("..exe silent r ".fnameescape(plugin))
-   exe "silent r ".fnameescape(plugin)
-   exe "silent bwipe ".bufnr("#")
+   exe "silent r ".plugin

   while search('^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+','W') != 0
-    let depscript   = substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+\s\+\(.*\)$','\1','e')
-    let depscriptid = substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\(\d\+\)\s\+.*$','\1','')
-    let llp1        = lastline+1
-"    call Decho("..depscript<".depscript.">")
+    let newscript= substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+\s\+\(.*\)$','\1','e')
+    let llp1     = lastline+1
+"    call Decho("..newscript<".newscript.">")

-    " found a "GetLatestVimScripts: # #" line in the script;
-    " check if its already in the datafile by searching backwards from llp1,
-    " the (prior to reading in the plugin script) last line plus one of the GetLatestVimScripts.dat file,
-    " for the script-id with no wrapping allowed.
-    let curline     = line(".")
-    let noai_script = substitute(depscript,'\s*:AutoInstall:\s*','','e')
-    exe llp1
-    let srchline    = search('^\s*'.depscriptid.'\s\+\d\+\s\+.*$','bW')
-    if srchline == 0
-     " this second search is taken when, for example, a   0 0 scriptname  is to be skipped over
-     let srchline= search('\<'.noai_script.'\>','bW')
+    " don't process ""GetLatestVimScripts lines
+    if newscript !~ '^"'
+     " found a "GetLatestVimScripts: # #" line in the script; check if its already in the datafile
+     let curline     = line(".")
+     let noai_script = substitute(newscript,'\s*:AutoInstall:\s*','','e')
+     exe llp1
+     let srchline    = search('\<'.noai_script.'\>','bW')
+"     call Decho("..noai_script<".noai_script."> srch=".srchline."curline#".line(".")." lastline#".lastline)
+
+     if srchline == 0
+      " found a new script to permanently include in the datafile
+      let keep_rega   = @a
+      let @a          = substitute(getline(curline),'^"\s\+GetLatestVimScripts:\s\+','','')
+      exe lastline."put a"
+      echomsg "Appending <".@a."> to ".datafile." for ".newscript
+"      call Decho("..APPEND (".noai_script.")<".@a."> to GetLatestVimScripts.dat")
+      let @a          = keep_rega
+      let lastline    = llp1
+      let curline     = curline     + 1
+      let foundscript = foundscript + 1
+"     else	" Decho
+"      call Decho("..found <".noai_script."> (already in datafile at line#".srchline.")")
+     endif
+
+     let curline = curline + 1
+     exe curline
    endif
-"    call Decho("..noai_script<".noai_script."> depscriptid#".depscriptid." srchline#".srchline." curline#".line(".")." lastline#".lastline)
-
-    if srchline == 0
-     " found a new script to permanently include in the datafile
-     let keep_rega   = @a
-     let @a          = substitute(getline(curline),'^"\s\+GetLatestVimScripts:\s\+','','')
-     echomsg "Appending <".@a."> to ".datafile." for ".depscript
-"     call Decho("..Appending <".@a."> to ".datafile." for ".depscript)
-     exe lastline."put a"
-     let @a          = keep_rega
-     let lastline    = llp1
-     let curline     = curline     + 1
-     let foundscript = foundscript + 1
-"    else	" Decho
-"     call Decho("..found <".noai_script."> (already in datafile at line#".srchline.")")
-    endif
-
-    let curline = curline + 1
-    exe curline
   endwhile

-   " llp1: last line plus one
   let llp1= lastline + 1
 "   call Decho(".deleting lines: ".llp1.",$d")
   exe "silent! ".llp1.",$d"
  endfor
 "  call Decho("--- end dependency checking loop ---  foundscript=".foundscript)
 "  call Decho(" ")
-"  call Dredir("BUFFER TEST (GetLatestVimScripts 1)","ls!")

  if foundscript == 0
-   setlocal nomod
+   set nomod
  endif

-  " --------------------------------------------------------------------
  " Check on out-of-date scripts using GetLatest/GetLatestVimScripts.dat
-  " --------------------------------------------------------------------
 "  call Decho("begin: checking out-of-date scripts using datafile<".datafile.">")
-  setlocal lz
+  set lz
  1
 "  /^-----/,$g/^\s*\d/call Decho(getline("."))
  1
@@ -319,349 +526,17 @@ fun! getscript#GetLatestVimScripts()
  if &mod
   silent! w!
  endif
-  q!
+  q

  " restore events and current directory
-  exe "cd ".fnameescape(substitute(origdir,'\','/','ge'))
-  let &ei  = eikeep
-  let &hls = hlskeep
-  let &acd = acdkeep
-  setlocal nolz
-"  call Dredir("BUFFER TEST (GetLatestVimScripts 2)","ls!")
+  exe "cd ".escape(substitute(origdir,'\','/','ge'),"|[]*'\" #")
+  let &ei= eikeep
+  set nolz
 "  call Dret("GetLatestVimScripts : did ".s:downloads." downloads")
 endfun
-
 " ---------------------------------------------------------------------
-"  GetOneScript: (Get Latest Vim Script) this function operates {{{1
-"    on the current line, interpreting two numbers and text as
-"    ScriptID, SourceID, and Filename.
-"    It downloads any scripts that have newer versions from vim.sourceforge.net.
-fun! s:GetOneScript(...)
-"   call Dfunc("GetOneScript()")

- " set options to allow progress to be shown on screen
-  let rega= @a
-  let t_ti= &t_ti
-  let t_te= &t_te
-  let rs  = &rs
-  set t_ti= t_te= nors
-
- " put current line on top-of-screen and interpret it into
- " a      script identifer  : used to obtain webpage
- "        source identifier : used to identify current version
- " and an associated comment: used to report on what's being considered
-  if a:0 >= 3
-   let scriptid = a:1
-   let srcid    = a:2
-   let fname    = a:3
-   let cmmnt    = ""
-"   call Decho("scriptid<".scriptid.">")
-"   call Decho("srcid   <".srcid.">")
-"   call Decho("fname   <".fname.">")
-  else
-   let curline  = getline(".")
-   if curline =~ '^\s*#'
-    let @a= rega
-"    call Dret("GetOneScript : skipping a pure comment line")
-    return
-   endif
-   let parsepat = '^\s*\(\d\+\)\s\+\(\d\+\)\s\+\(.\{-}\)\(\s*#.*\)\=$'
-   try
-    let scriptid = substitute(curline,parsepat,'\1','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
-    let scriptid= 0
-   endtry
-   try
-    let srcid    = substitute(curline,parsepat,'\2','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
-    let srcid= 0
-   endtry
-   try
-    let fname= substitute(curline,parsepat,'\3','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
-    let fname= ""
-   endtry
-   try
-    let cmmnt= substitute(curline,parsepat,'\4','e')
-   catch /^Vim\%((\a\+)\)\=:E486/
-    let cmmnt= ""
-   endtry
-"   call Decho("curline <".curline.">")
-"   call Decho("parsepat<".parsepat.">")
-"   call Decho("scriptid<".scriptid.">")
-"   call Decho("srcid   <".srcid.">")
-"   call Decho("fname   <".fname.">")
-  endif
-
-  " plugin author protection from downloading his/her own scripts atop their latest work
-  if scriptid == 0 || srcid == 0
-   " When looking for :AutoInstall: lines, skip scripts that have   0 0 scriptname
-   let @a= rega
-"   call Dret("GetOneScript : skipping a scriptid==srcid==0 line")
-   return
-  endif
-
-  let doautoinstall= 0
-  if fname =~ ":AutoInstall:"
-"   call Decho("case AutoInstall: fname<".fname.">")
-   let aicmmnt= substitute(fname,'\s\+:AutoInstall:\s\+',' ','')
-"   call Decho("aicmmnt<".aicmmnt."> s:autoinstall=".s:autoinstall)
-   if s:autoinstall != ""
-    let doautoinstall = g:GetLatestVimScripts_allowautoinstall
-   endif
-  else
-   let aicmmnt= fname
-  endif
-"  call Decho("aicmmnt<".aicmmnt.">: doautoinstall=".doautoinstall)
-
-  exe "norm z\<CR>"
-  redraw!
-"  call Decho('considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid)
-  echo 'considering <'.aicmmnt.'> scriptid='.scriptid.' srcid='.srcid
-
-  " grab a copy of the plugin's vim.sourceforge.net webpage
-  let scriptaddr = g:GetLatestVimScripts_scriptaddr.scriptid
-  let tmpfile    = tempname()
-  let v:errmsg   = ""
-
-  " make up to three tries at downloading the description
-  let itry= 1
-  while itry <= 3
-"   call Decho(".try#".itry." to download description of <".aicmmnt."> with addr=".scriptaddr)
-   if has("win32") || has("win16") || has("win95")
-"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile).' '.shellescape(scriptaddr)."|bw!")
-    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile).' '.shellescape(scriptaddr)|bw!
-   else
-"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile)." ".shellescape(scriptaddr))
-    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(tmpfile)." ".shellescape(scriptaddr)
-   endif
-   if itry == 1
-    exe "silent vsplit ".fnameescape(tmpfile)
-   else
-    silent! e %
-   endif
-   setlocal bh=wipe
-  
-   " find the latest source-id in the plugin's webpage
-   silent! 1
-   let findpkg= search('Click on the package to download','W')
-   if findpkg > 0
-    break
-   endif
-   let itry= itry + 1
-  endwhile
-"  call Decho(" --- end downloading tries while loop --- itry=".itry)
-
-  " testing: did finding "Click on the package..." fail?
-  if findpkg == 0 || itry >= 4
-   silent q!
-   call delete(tmpfile)
-  " restore options
-   let &t_ti        = t_ti
-   let &t_te        = t_te
-   let &rs          = rs
-   let s:downerrors = s:downerrors + 1
-"   call Decho("***warning*** couldn'".'t find "Click on the package..." in description page for <'.aicmmnt.">")
-   echomsg "***warning*** couldn'".'t find "Click on the package..." in description page for <'.aicmmnt.">"
-"   call Dret("GetOneScript : srch for /Click on the package/ failed")
-   let @a= rega
-   return
-  endif
-"  call Decho('found "Click on the package to download"')
-
-  let findsrcid= search('src_id=','W')
-  if findsrcid == 0
-   silent q!
-   call delete(tmpfile)
-  " restore options
-   let &t_ti        = t_ti
-   let &t_te        = t_te
-   let &rs          = rs
-   let s:downerrors = s:downerrors + 1
-"   call Decho("***warning*** couldn'".'t find "src_id=" in description page for <'.aicmmnt.">")
-   echomsg "***warning*** couldn'".'t find "src_id=" in description page for <'.aicmmnt.">"
-   let @a= rega
-"  call Dret("GetOneScript : srch for /src_id/ failed")
-   return
-  endif
-"  call Decho('found "src_id=" in description page')
-
-  let srcidpat   = '^\s*<td class.*src_id=\(\d\+\)">\([^<]\+\)<.*$'
-  let latestsrcid= substitute(getline("."),srcidpat,'\1','')
-  let sname      = substitute(getline("."),srcidpat,'\2','') " script name actually downloaded
-"  call Decho("srcidpat<".srcidpat."> latestsrcid<".latestsrcid."> sname<".sname.">")
-  silent q!
-  call delete(tmpfile)
-
-  " convert the strings-of-numbers into numbers
-  let srcid       = srcid       + 0
-  let latestsrcid = latestsrcid + 0
-"  call Decho("srcid=".srcid." latestsrcid=".latestsrcid." sname<".sname.">")
-
-  " has the plugin's most-recent srcid increased, which indicates that it has been updated
-  if latestsrcid > srcid
-"   call Decho("[latestsrcid=".latestsrcid."] <= [srcid=".srcid."]: need to update <".sname.">")
-
-   let s:downloads= s:downloads + 1
-   if sname == bufname("%")
-    " GetLatestVimScript has to be careful about downloading itself
-    let sname= "NEW_".sname
-   endif
-
-   " -----------------------------------------------------------------------------
-   " the plugin has been updated since we last obtained it, so download a new copy
-   " -----------------------------------------------------------------------------
-"   call Decho(".downloading new <".sname.">")
-   echomsg ".downloading new <".sname.">"
-   if has("win32") || has("win16") || has("win95")
-"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='.latestsrcid)."|q")
-    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='.latestsrcid)|q
-   else
-"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='))
-    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id=').latestsrcid
-   endif
-
-   " --------------------------------------------------------------------------
-   " AutoInstall: only if doautoinstall has been requested by the plugin itself
-   " --------------------------------------------------------------------------
-"   call Decho("checking if plugin requested autoinstall: doautoinstall=".doautoinstall)
-   if doautoinstall
-"    call Decho(" ")
-"    call Decho("Autoinstall: getcwd<".getcwd()."> filereadable(".sname.")=".filereadable(sname))
-    if filereadable(sname)
-"     call Decho("<".sname."> is readable")
-"     call Decho("exe silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".shellescape(s:autoinstall))
-     exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".shellescape(s:autoinstall)
-     let curdir    = fnameescape(substitute(getcwd(),'\','/','ge'))
-     let installdir= curdir."/Installed"
-     if !isdirectory(installdir)
-      call mkdir(installdir)
-     endif
-"     call Decho("curdir<".curdir."> installdir<".installdir.">")
-"     call Decho("exe cd ".fnameescape(s:autoinstall))
-     exe "cd ".fnameescape(s:autoinstall)
-
-     " determine target directory for moves
-     let firstdir= substitute(&rtp,',.*$','','')
-     let pname   = substitute(sname,'\..*','.vim','')
-"     call Decho("determine tgtdir: is <".firstdir.'/AsNeeded/'.pname." readable?")
-     if filereadable(firstdir.'/AsNeeded/'.pname)
-      let tgtdir= "AsNeeded"
-     else
-      let tgtdir= "plugin"
-     endif
-"     call Decho("tgtdir<".tgtdir.">  pname<".pname.">")
-     
-     " decompress
-     if sname =~ '\.bz2$'
-"      call Decho("decompress: attempt to bunzip2 ".sname)
-      exe "sil !bunzip2 ".shellescape(sname)
-      let sname= substitute(sname,'\.bz2$','','')
-"      call Decho("decompress: new sname<".sname."> after bunzip2")
-     elseif sname =~ '\.gz$'
-"      call Decho("decompress: attempt to gunzip ".sname)
-      exe "sil !gunzip ".shellescape(sname)
-      let sname= substitute(sname,'\.gz$','','')
-"      call Decho("decompress: new sname<".sname."> after gunzip")
-     elseif sname =~ '\.xz$'
-"      call Decho("decompress: attempt to unxz ".sname)
-      exe "sil !unxz ".shellescape(sname)
-      let sname= substitute(sname,'\.xz$','','')
-"      call Decho("decompress: new sname<".sname."> after unxz")
-     else
-"      call Decho("no decompression needed")
-     endif
-     
-     " distribute archive(.zip, .tar, .vba, ...) contents
-     if sname =~ '\.zip$'
-"      call Decho("dearchive: attempt to unzip ".sname)
-      exe "silent !unzip -o ".shellescape(sname)
-     elseif sname =~ '\.tar$'
-"      call Decho("dearchive: attempt to untar ".sname)
-      exe "silent !tar -xvf ".shellescape(sname)
-     elseif sname =~ '\.tgz$'
-"      call Decho("dearchive: attempt to untar+gunzip ".sname)
-      exe "silent !tar -zxvf ".shellescape(sname)
-     elseif sname =~ '\.taz$'
-"      call Decho("dearchive: attempt to untar+uncompress ".sname)
-      exe "silent !tar -Zxvf ".shellescape(sname)
-     elseif sname =~ '\.tbz$'
-"      call Decho("dearchive: attempt to untar+bunzip2 ".sname)
-      exe "silent !tar -jxvf ".shellescape(sname)
-     elseif sname =~ '\.txz$'
-"      call Decho("dearchive: attempt to untar+xz ".sname)
-      exe "silent !tar -Jxvf ".shellescape(sname)
-     elseif sname =~ '\.vba$'
-"      call Decho("dearchive: attempt to handle a vimball: ".sname)
-      silent 1split
-      if exists("g:vimball_home")
-       let oldvimballhome= g:vimball_home
-      endif
-      let g:vimball_home= s:autoinstall
-      exe "silent e ".fnameescape(sname)
-      silent so %
-      silent q
-      if exists("oldvimballhome")
-       let g:vimball_home= oldvimballhome
-      else
-       unlet g:vimball_home
-      endif
-     else
-"      call Decho("no dearchiving needed")
-     endif
-     
-     " ---------------------------------------------
-     " move plugin to plugin/ or AsNeeded/ directory
-     " ---------------------------------------------
-     if sname =~ '.vim$'
-"      call Decho("dearchive: attempt to simply move ".sname." to ".tgtdir)
-      exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".tgtdir
-     else
-"      call Decho("dearchive: move <".sname."> to installdir<".installdir.">")
-      exe "silent !".g:GetLatestVimScripts_mv." ".shellescape(sname)." ".installdir
-     endif
-     if tgtdir != "plugin"
-"      call Decho("exe silent !".g:GetLatestVimScripts_mv." plugin/".shellescape(pname)." ".tgtdir)
-      exe "silent !".g:GetLatestVimScripts_mv." plugin/".shellescape(pname)." ".tgtdir
-     endif
-     
-     " helptags step
-     let docdir= substitute(&rtp,',.*','','e')."/doc"
-"     call Decho("helptags: docdir<".docdir.">")
-     exe "helptags ".fnameescape(docdir)
-     exe "cd ".fnameescape(curdir)
-    endif
-    if fname !~ ':AutoInstall:'
-     let modline=scriptid." ".latestsrcid." :AutoInstall: ".fname.cmmnt
-    else
-     let modline=scriptid." ".latestsrcid." ".fname.cmmnt
-    endif
-   else
-    let modline=scriptid." ".latestsrcid." ".fname.cmmnt
-   endif
-
-   " update the data in the <GetLatestVimScripts.dat> file
-   call setline(line("."),modline)
-"   call Decho("update data in ".expand("%")."#".line(".").": modline<".modline.">")
-"  else " Decho
-"   call Decho("[latestsrcid=".latestsrcid."] <= [srcid=".srcid."], no need to update")
-  endif
-
- " restore options
-  let &t_ti = t_ti
-  let &t_te = t_te
-  let &rs   = rs
-  let @a    = rega
-"  call Dredir("BUFFER TEST (GetOneScript)","ls!")
-
-"  call Dret("GetOneScript")
-endfun
-
-" ---------------------------------------------------------------------
 " Restore Options: {{{1
 let &cpo= s:keepcpo
-unlet s:keepcpo

-" ---------------------------------------------------------------------
-"  Modelines: {{{1
 " vim: ts=8 sts=2 fdm=marker nowrap
@@ -1,15 +1,14 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada/GNAT compiler file
 "     Language: Ada (GNAT)
-"          $Id: gnat.vim 887 2008-07-08 14:29:01Z krischik $
+"          $Id$
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>k
-"		Ned Okie <nokie@radford.edu>
-"      $Author: krischik $
-"        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
-"      Version: 4.6
-"    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/gnat.vim $
+"   Maintainer:	Martin Krischik
+"      $Author$
+"        $Date$
+"      Version: 4.2
+"    $Revision$
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/gnat.vim $
 "      History: 24.05.2006 MK Unified Headers
 "		16.07.2006 MK Ada-Mode as vim-ball
 "		05.08.2006 MK Add session support
@@ -17,7 +16,6 @@
 "               05.11.2006 MK Bram suggested not to use include protection for
 "                             autoload
 "		05.11.2006 MK Bram suggested to save on spaces
-"		19.09.2007 NO use project file only when there is a project
 "    Help Page: compiler-gnat
 "------------------------------------------------------------------------------

@@ -73,19 +71,13 @@ function gnat#Set_Project_File (...) dict			     " {{{1
      execute 'mksession! ' . v:this_session
   endif

-   "if strlen (self.Project_File) > 0
-      "if has("vms")
-	 "call ada#Switch_Session (
-	    "\ expand('~')[0:-2] . ".vimfiles.session]gnat_" .
-	    "\ fnamemodify (self.Project_File, ":t:r") . ".vim")
-      "else
-	 "call ada#Switch_Session (
-	    "\ expand('~') . "/vimfiles/session/gnat_" .
-	    "\ fnamemodify (self.Project_File, ":t:r") . ".vim")
-      "endif
-   "else
-      "call ada#Switch_Session ('')
-   "endif
+   if strlen (self.Project_File) > 0
+      call ada#Switch_Session (
+	 \ expand('~') . "/vimfiles/session/" .
+	 \ fnamemodify (self.Project_File, ":t:r") . ".vim")
+   else
+      call ada#Switch_Session ('')
+   endif

   return
 endfunction gnat#Set_Project_File				     " }}}1
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2008 Jul 04
+" Last Change: 2007 May 10

 " These functions are used by the gzip plugin.

@@ -73,15 +73,8 @@ fun gzip#read(cmd)
  let empty = line("'[") == 1 && line("']") == line("$")
  let tmp = tempname()
  let tmpe = tmp . "." . expand("<afile>:e")
-  if exists('*fnameescape')
-    let tmp_esc = fnameescape(tmp)
-    let tmpe_esc = fnameescape(tmpe)
-  else
-    let tmp_esc = escape(tmp, ' ')
-    let tmpe_esc = escape(tmpe, ' ')
-  endif
  " write the just read lines to a temp file "'[,']w tmp.gz"
-  execute "silent '[,']w " . tmpe_esc
+  execute "silent '[,']w " . escape(tmpe, ' ')
  " uncompress the temp file: call system("gzip -dn tmp.gz")
  call system(a:cmd . " " . s:escape(tmpe))
  if !filereadable(tmp)
@@ -102,12 +95,12 @@ fun gzip#read(cmd)
    setlocal nobin
    if exists(":lockmarks")
      if empty
-	execute "silent lockmarks " . l . "r ++edit " . tmp_esc
+	execute "silent lockmarks " . l . "r ++edit " . tmp
      else
-	execute "silent lockmarks " . l . "r " . tmp_esc
+	execute "silent lockmarks " . l . "r " . tmp
      endif
    else
-      execute "silent " . l . "r " . tmp_esc
+      execute "silent " . l . "r " . tmp
    endif

    " if buffer became empty, delete trailing blank line
@@ -117,8 +110,8 @@ fun gzip#read(cmd)
    endif
    " delete the temp file and the used buffers
    call delete(tmp)
-    silent! exe "bwipe " . tmp_esc
-    silent! exe "bwipe " . tmpe_esc
+    silent! exe "bwipe " . tmp
+    silent! exe "bwipe " . tmpe
  endif

  " Restore saved option values.
@@ -131,15 +124,10 @@ fun gzip#read(cmd)

  " When uncompressed the whole buffer, do autocommands
  if ok && empty
-    if exists('*fnameescape')
-      let fname = fnameescape(expand("%:r"))
-    else
-      let fname = escape(expand("%:r"), " \t\n*?[{`$\\%#'\"|!<")
-    endif
    if &verbose >= 8
-      execute "doau BufReadPost " . fname
+      execute "doau BufReadPost " . expand("%:r")
    else
-      execute "silent! doau BufReadPost " . fname
+      execute "silent! doau BufReadPost " . expand("%:r")
    endif
  endif
 endfun
@@ -153,9 +141,9 @@ fun gzip#write(cmd)
    let nmt = s:tempname(nm)
    if rename(nm, nmt) == 0
      if exists("b:gzip_comp_arg")
-	call system(a:cmd . " " . b:gzip_comp_arg . " -- " . s:escape(nmt))
+	call system(a:cmd . " " . b:gzip_comp_arg . " " . s:escape(nmt))
      else
-	call system(a:cmd . " -- " . s:escape(nmt))
+	call system(a:cmd . " " . s:escape(nmt))
      endif
      call rename(nmt . "." . expand("<afile>:e"), nm)
    endif
@@ -180,10 +168,10 @@ fun gzip#appre(cmd)
    if rename(nm, nmte) == 0
      if &patchmode != "" && getfsize(nm . &patchmode) == -1
 	" Create patchmode file by creating the decompressed file new
-	call system(a:cmd . " -c -- " . s:escape(nmte) . " > " . s:escape(nmt))
+	call system(a:cmd . " -c " . s:escape(nmte) . " > " . s:escape(nmt))
 	call rename(nmte, nm . &patchmode)
      else
-	call system(a:cmd . " -- " . s:escape(nmte))
+	call system(a:cmd . " " . s:escape(nmte))
      endif
      call rename(nmt, nm)
    endif
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2011 Apr 28
+" Last Change:	2006 Oct 19

 function! htmlcomplete#CompleteTags(findstart, base)
  if a:findstart
@@ -285,7 +285,6 @@ function! htmlcomplete#CompleteTags(findstart, base)
 				let cssfiles = styletable + secimportfiles
 				let classes = []
 				for file in cssfiles
-				  	let classlines = []
 					if filereadable(file)
 						let stylesheet = readfile(file)
 						let stylefile = join(stylesheet, ' ')
@@ -1,9 +1,9 @@
 " netrwFileHandlers: contains various extension-based file handlers for
 "                    netrw's browsers' x command ("eXecute launcher")
-" Author:	Charles E. Campbell
-" Date:		May 03, 2013
-" Version:	11b	ASTRO-ONLY
-" Copyright:    Copyright (C) 1999-2012 Charles E. Campbell {{{1
+" Author:	Charles E. Campbell, Jr.
+" Date:		May 30, 2006
+" Version:	9
+" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -20,24 +20,18 @@
 if exists("g:loaded_netrwFileHandlers") || &cp
 finish
 endif
-let g:loaded_netrwFileHandlers= "v11b"
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of netrwFileHandlers needs vim 7.2"
- echohl Normal
- finish
-endif
 let s:keepcpo= &cpo
 set cpo&vim
+let g:loaded_netrwFileHandlers= "v9"

 " ---------------------------------------------------------------------
 " netrwFileHandlers#Invoke: {{{1
 fun! netrwFileHandlers#Invoke(exten,fname)
 "  call Dfunc("netrwFileHandlers#Invoke(exten<".a:exten."> fname<".a:fname.">)")
-  let exten= a:exten
+  let fname= a:fname
  " list of supported special characters.  Consider rcs,v --- that can be
  " supported with a NFH_rcsCOMMAv() handler
-  if exten =~ '[@:,$!=\-+%?;~]'
+  if a:fname =~ '[@:,$!=\-+%?;~]'
   let specials= {
 \   '@' : 'AT',
 \   ':' : 'COLON',
@@ -51,20 +45,20 @@ fun! netrwFileHandlers#Invoke(exten,fname)
 \   '?' : 'QUESTION',
 \   ';' : 'SEMICOLON',
 \   '~' : 'TILDE'}
-   let exten= substitute(a:exten,'[@:,$!=\-+%?;~]','\=specials[submatch(0)]','ge')
+   let fname= substitute(a:fname,'[@:,$!=\-+%?;~]','\=specials[submatch(0)]','ge')
 "   call Decho('fname<'.fname.'> done with dictionary')
  endif

-  if a:exten != "" && exists("*NFH_".exten)
+  if a:exten != "" && exists("*NFH_".a:exten)
   " support user NFH_*() functions
 "   call Decho("let ret= netrwFileHandlers#NFH_".a:exten.'("'.fname.'")')
-   exe "let ret= NFH_".exten.'("'.a:fname.'")'
-  elseif a:exten != "" && exists("*s:NFH_".exten)
+   exe "let ret= NFH_".a:exten.'("'.fname.'")'
+  elseif a:exten != "" && exists("*s:NFH_".a:exten)
   " use builtin-NFH_*() functions
 "   call Decho("let ret= netrwFileHandlers#NFH_".a:exten.'("'.fname.'")')
-   exe "let ret= s:NFH_".a:exten.'("'.a:fname.'")'
+   exe "let ret= s:NFH_".a:exten.'("'.fname.'")'
  endif
-
+  
 "  call Dret("netrwFileHandlers#Invoke 0 : ret=".ret)
  return 0
 endfun
@@ -79,10 +73,10 @@ fun! s:NFH_html(pagefile)

  if executable("mozilla")
 "   call Decho("executing !mozilla ".page)
-   exe "!mozilla ".shellescape(page,1)
+   exe "!mozilla ".g:netrw_shq.page.g:netrw_shq
  elseif executable("netscape")
 "   call Decho("executing !netscape ".page)
-   exe "!netscape ".shellescape(page,1)
+   exe "!netscape ".g:netrw_shq..page.g:netrw_shq
  else
 "   call Dret("s:NFH_html 0")
   return 0
@@ -102,10 +96,10 @@ fun! s:NFH_htm(pagefile)

  if executable("mozilla")
 "   call Decho("executing !mozilla ".page)
-   exe "!mozilla ".shellescape(page,1)
+   exe "!mozilla ".g:netrw_shq.page.g:netrw_shq
  elseif executable("netscape")
 "   call Decho("executing !netscape ".page)
-   exe "!netscape ".shellescape(page,1)
+   exe "!netscape ".g:netrw_shq.page.g:netrw_shq
  else
 "   call Dret("s:NFH_htm 0")
   return 0
@@ -121,10 +115,10 @@ fun! s:NFH_jpg(jpgfile)
 "  call Dfunc("s:NFH_jpg(jpgfile<".a:jpgfile.">)")

  if executable("gimp")
-   exe "silent! !gimp -s ".shellescape(a:jpgfile,1)
+   exe "silent! !gimp -s ".g:netrw_shq.a:jpgfile.g:netrw_shq
  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
 "   call Decho("silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".escape(a:jpgfile," []|'"))
-   exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:jpgfile,1)
+   exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:jpgfile.g:netrw_shq
  else
 "   call Dret("s:NFH_jpg 0")
   return 0
@@ -140,9 +134,9 @@ fun! s:NFH_gif(giffile)
 "  call Dfunc("s:NFH_gif(giffile<".a:giffile.">)")

  if executable("gimp")
-   exe "silent! !gimp -s ".shellescape(a:giffile,1)
+   exe "silent! !gimp -s ".g:netrw_shq.a:giffile.g:netrw_shq
  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:giffile,1)
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:giffile.g:netrw_shq
  else
 "   call Dret("s:NFH_gif 0")
   return 0
@@ -158,9 +152,9 @@ fun! s:NFH_png(pngfile)
 "  call Dfunc("s:NFH_png(pngfile<".a:pngfile.">)")

  if executable("gimp")
-   exe "silent! !gimp -s ".shellescape(a:pngfile,1)
+   exe "silent! !gimp -s ".g:netrw_shq.a:pngfile.g:netrw_shq
  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:pngfile,1)
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:pngfile.g:netrw_shq
  else
 "   call Dret("s:NFH_png 0")
   return 0
@@ -176,9 +170,9 @@ fun! s:NFH_pnm(pnmfile)
 "  call Dfunc("s:NFH_pnm(pnmfile<".a:pnmfile.">)")

  if executable("gimp")
-   exe "silent! !gimp -s ".shellescape(a:pnmfile,1)
+   exe "silent! !gimp -s ".g:netrw_shq.a:pnmfile.g:netrw_shq
  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:pnmfile,1)
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:pnmfile.g:netrw_shq
  else
 "   call Dret("s:NFH_pnm 0")
   return 0
@@ -196,7 +190,7 @@ fun! s:NFH_bmp(bmpfile)
  if executable("gimp")
   exe "silent! !gimp -s ".a:bmpfile
  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".shellescape(a:bmpfile,1)
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".g:netrw_shq.a:bmpfile.g:netrw_shq
  else
 "   call Dret("s:NFH_bmp 0")
   return 0
@@ -211,9 +205,9 @@ endfun
 fun! s:NFH_pdf(pdf)
 "  call Dfunc("s:NFH_pdf(pdf<".a:pdf.">)")
  if executable("gs")
-   exe 'silent! !gs '.shellescape(a:pdf,1)
+   exe 'silent! !gs '.g:netrw_shq.a:pdf.g:netrw_shq
  elseif executable("pdftotext")
-   exe 'silent! pdftotext -nopgbrk '.shellescape(a:pdf,1)
+   exe 'silent! pdftotext -nopgbrk '.g:netrw_shq.a:pdf.g:netrw_shq
  else
 "  call Dret("s:NFH_pdf 0")
   return 0
@@ -229,7 +223,7 @@ fun! s:NFH_doc(doc)
 "  call Dfunc("s:NFH_doc(doc<".a:doc.">)")

  if executable("oowriter")
-   exe 'silent! !oowriter '.shellescape(a:doc,1)
+   exe 'silent! !oowriter '.g:netrw_shq.a:doc.g:netrw_shq
   redraw!
  else
 "  call Dret("s:NFH_doc 0")
@@ -246,7 +240,7 @@ fun! s:NFH_sxw(sxw)
 "  call Dfunc("s:NFH_sxw(sxw<".a:sxw.">)")

  if executable("oowriter")
-   exe 'silent! !oowriter '.shellescape(a:sxw,1)
+   exe 'silent! !oowriter '.g:netrw_shq.a:sxw.g:netrw_shq
   redraw!
  else
 "   call Dret("s:NFH_sxw 0")
@@ -263,7 +257,7 @@ fun! s:NFH_xls(xls)
 "  call Dfunc("s:NFH_xls(xls<".a:xls.">)")

  if executable("oocalc")
-   exe 'silent! !oocalc '.shellescape(a:xls,1)
+   exe 'silent! !oocalc '.g:netrw_shq.a:xls.g:netrw_shq
   redraw!
  else
 "  call Dret("s:NFH_xls 0")
@@ -280,15 +274,15 @@ fun! s:NFH_ps(ps)
 "  call Dfunc("s:NFH_ps(ps<".a:ps.">)")
  if executable("gs")
 "   call Decho("exe silent! !gs ".a:ps)
-   exe "silent! !gs ".shellescape(a:ps,1)
+   exe "silent! !gs ".g:netrw_shq.a:ps.g:netrw_shq
   redraw!
  elseif executable("ghostscript")
 "   call Decho("exe silent! !ghostscript ".a:ps)
-   exe "silent! !ghostscript ".shellescape(a:ps,1)
+   exe "silent! !ghostscript ".g:netrw_shq.a:ps.g:netrw_shq
   redraw!
  elseif executable("gswin32")
-"   call Decho("exe silent! !gswin32 ".shellescape(a:ps,1))
-   exe "silent! !gswin32 ".shellescape(a:ps,1)
+"   call Decho("exe silent! !gswin32 ".g:netrw_shq.a:ps.g:netrw_shq)
+   exe "silent! !gswin32 ".g:netrw_shq.a:ps.g:netrw_shq
   redraw!
  else
 "   call Dret("s:NFH_ps 0")
@@ -304,16 +298,16 @@ endfun
 fun! s:NFH_eps(eps)
 "  call Dfunc("s:NFH_eps()")
  if executable("gs")
-   exe "silent! !gs ".shellescape(a:eps,1)
+   exe "silent! !gs ".g:netrw_shq.a:eps.g:netrw_shq
   redraw!
  elseif executable("ghostscript")
-   exe "silent! !ghostscript ".shellescape(a:eps,1)
+   exe "silent! !ghostscript ".g:netrw_shq.a:eps.g:netrw_shq
   redraw!
  elseif executable("ghostscript")
-   exe "silent! !ghostscript ".shellescape(a:eps,1)
+   exe "silent! !ghostscript ".g:netrw_shq.a:eps.g:netrw_shq
   redraw!
  elseif executable("gswin32")
-   exe "silent! !gswin32 ".shellescape(a:eps,1)
+   exe "silent! !gswin32 ".g:netrw_shq.a:eps.g:netrw_shq
   redraw!
  else
 "   call Dret("s:NFH_eps 0")
@@ -356,7 +350,6 @@ fun! s:NFH_obj(obj)
 endfun

 let &cpo= s:keepcpo
-unlet s:keepcpo
 " ---------------------------------------------------------------------
 "  Modelines: {{{1
 "  vim: fdm=marker
@@ -1,8 +1,8 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		May 03, 2013
-" Maintainer:	Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
-" Version:	14a	ASTRO-ONLY
-" Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
+" Date:		Mar 26, 2007
+" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" Version:	9
+" Copyright:    Copyright (C) 1999-2007 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -19,19 +19,13 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v14a"
-if v:version < 700
- echohl WarningMsg
- echo "***warning*** this version of netrwSettings needs vim 7.0"
- echohl Normal
- finish
-endif
+let g:loaded_netrwSettings  = "v9"

 " ---------------------------------------------------------------------
 " NetrwSettings: {{{1
 fun! netrwSettings#NetrwSettings()
  " this call is here largely just to insure that netrw has been loaded
-  call netrw#NetrwSavePosn()
+  call netrw#NetSavePosn()
  if !exists("g:loaded_netrw")
   echohl WarningMsg | echomsg "***sorry*** netrw needs to be loaded prior to using NetrwSettings" | echohl None
   return
@@ -63,7 +57,7 @@ fun! netrwSettings#NetrwSettings()
  endif

  put ='+ ---------------------------------------------'
-  put ='+  NetrwSettings:  by Charles E. Campbell'
+  put ='+  NetrwSettings:  by Charles E. Campbell, Jr.'
  put ='+ Press <F1> with cursor atop any line for help'
  put ='+ ---------------------------------------------'
  let s:netrw_settings_stop= line(".")
@@ -88,7 +82,8 @@ fun! netrwSettings#NetrwSettings()
  put = 'let g:netrw_ftpmode           = '.g:netrw_ftpmode
  put = 'let g:netrw_ignorenetrc       = '.g:netrw_ignorenetrc
  put = 'let g:netrw_sshport           = '.g:netrw_sshport
-  put = 'let g:netrw_silent            = '.g:netrw_silent
+  let shqline= line("$")
+  put = 'let g:netrw_shq...'
  put = 'let g:netrw_use_nt_rcp        = '.g:netrw_use_nt_rcp
  put = 'let g:netrw_win95ftp          = '.g:netrw_win95ftp
  let s:netrw_xfer_stop= line(".")
@@ -100,89 +95,41 @@ fun! netrwSettings#NetrwSettings()
  put ='+ Netrw Browser Control'
  put = 'let g:netrw_alto              = '.g:netrw_alto
  put = 'let g:netrw_altv              = '.g:netrw_altv
-  put = 'let g:netrw_banner            = '.g:netrw_banner
-  if exists("g:netrw_bannerbackslash")
-   put = 'let g:netrw_bannerbackslash   = '.g:netrw_bannerbackslash
-  else
-   put = '\" let g:netrw_bannerbackslash   = (not defined)'
-  endif
  put = 'let g:netrw_browse_split      = '.g:netrw_browse_split
  if exists("g:netrw_browsex_viewer")
-   put = 'let g:netrw_browsex_viewer   = '.g:netrw_browsex_viewer
+   put = 'let g:netrw_browsex_viewer    = '.g:netrw_browsex_viewer
  else
-   put = '\" let g:netrw_browsex_viewer   = (not defined)'
-  endif
-  put = 'let g:netrw_compress          = '.g:netrw_compress
-  if exists("g:Netrw_corehandler")
-   put = 'let g:Netrw_corehandler      = '.g:Netrw_corehandler
-  else
-   put = '\" let g:Netrw_corehandler      = (not defined)'
-  endif
-  put = 'let g:netrw_ctags             = '.g:netrw_ctags
-  put = 'let g:netrw_cursor            = '.g:netrw_cursor
-  let decompressline= line("$")
-  put = 'let g:netrw_decompress        = '.string(g:netrw_decompress)
-  if exists("g:netrw_dynamic_maxfilenamelen")
-   put = 'let g:netrw_dynamic_maxfilenamelen='.g:netrw_dynamic_maxfilenamelen
-  else
-   put = '\" let g:netrw_dynamic_maxfilenamelen= (not defined)'
+   put = 'let g:netrw_browsex_viewer    = (not defined)'
  endif
  put = 'let g:netrw_dirhistmax        = '.g:netrw_dirhistmax
-  put = 'let g:netrw_errorlvl          = '.g:netrw_errorlvl
  put = 'let g:netrw_fastbrowse        = '.g:netrw_fastbrowse
-  let fnameescline= line("$")
-  put = 'let g:netrw_fname_escape      = '.string(g:netrw_fname_escape)
  put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
  put = 'let g:netrw_ftp_list_cmd      = '.g:netrw_ftp_list_cmd
  put = 'let g:netrw_ftp_sizelist_cmd  = '.g:netrw_ftp_sizelist_cmd
  put = 'let g:netrw_ftp_timelist_cmd  = '.g:netrw_ftp_timelist_cmd
-  let globescline= line("$")
-  put = 'let g:netrw_glob_escape       = '.string(g:netrw_glob_escape)
  put = 'let g:netrw_hide              = '.g:netrw_hide
-  if exists("g:netrw_home")
-   put = 'let g:netrw_home              = '.g:netrw_home
-  else
-   put = '\" let g:netrw_home              = (not defined)'
-  endif
  put = 'let g:netrw_keepdir           = '.g:netrw_keepdir
  put = 'let g:netrw_list_cmd          = '.g:netrw_list_cmd
  put = 'let g:netrw_list_hide         = '.g:netrw_list_hide
+  put = 'let g:netrw_local_mkdir       = '.g:netrw_local_mkdir
+  put = 'let g:netrw_local_rmdir       = '.g:netrw_local_rmdir
  put = 'let g:netrw_liststyle         = '.g:netrw_liststyle
-  put = 'let g:netrw_localcopycmd      = '.g:netrw_localcopycmd
-  put = 'let g:netrw_localmkdir        = '.g:netrw_localmkdir
-  put = 'let g:netrw_localmovecmd      = '.g:netrw_localmovecmd
-  put = 'let g:netrw_localrmdir        = '.g:netrw_localrmdir
  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
  put = 'let g:netrw_menu              = '.g:netrw_menu
-  put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
  put = 'let g:netrw_mkdir_cmd         = '.g:netrw_mkdir_cmd
-  if exists("g:netrw_nobeval")
-   put = 'let g:netrw_nobeval           = '.g:netrw_nobeval
-  else
-   put = '\" let g:netrw_nobeval           = (not defined)'
-  endif
-  put = 'let g:netrw_remote_mkdir      = '.g:netrw_remote_mkdir
-  put = 'let g:netrw_preview           = '.g:netrw_preview
  put = 'let g:netrw_rename_cmd        = '.g:netrw_rename_cmd
-  put = 'let g:netrw_retmap            = '.g:netrw_retmap
  put = 'let g:netrw_rm_cmd            = '.g:netrw_rm_cmd
  put = 'let g:netrw_rmdir_cmd         = '.g:netrw_rmdir_cmd
  put = 'let g:netrw_rmf_cmd           = '.g:netrw_rmf_cmd
+  put = 'let g:netrw_silent            = '.g:netrw_silent
  put = 'let g:netrw_sort_by           = '.g:netrw_sort_by
  put = 'let g:netrw_sort_direction    = '.g:netrw_sort_direction
-  put = 'let g:netrw_sort_options      = '.g:netrw_sort_options
  put = 'let g:netrw_sort_sequence     = '.g:netrw_sort_sequence
-  put = 'let g:netrw_special_syntax    = '.g:netrw_special_syntax
  put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
-  put = 'let g:netrw_ssh_cmd           = '.g:netrw_ssh_cmd
  put = 'let g:netrw_scpport           = '.g:netrw_scpport
-  put = 'let g:netrw_sepchr            = '.g:netrw_sepchr
  put = 'let g:netrw_sshport           = '.g:netrw_sshport
  put = 'let g:netrw_timefmt           = '.g:netrw_timefmt
-  let tmpfileescline= line("$")
-  put ='let g:netrw_tmpfile_escape...'
  put = 'let g:netrw_use_noswf         = '.g:netrw_use_noswf
-  put = 'let g:netrw_xstrlen           = '.g:netrw_xstrlen
  put = 'let g:netrw_winsize           = '.g:netrw_winsize

  put =''
@@ -195,10 +142,13 @@ fun! netrwSettings#NetrwSettings()
  silent %s/= $/= ''/e
  1

-  call setline(decompressline,"let g:netrw_decompress        = ".substitute(string(g:netrw_decompress),"^'\\(.*\\)'$",'\1',''))
-  call setline(fnameescline,  "let g:netrw_fname_escape      = '".escape(g:netrw_fname_escape,"'")."'")
-  call setline(globescline,   "let g:netrw_glob_escape       = '".escape(g:netrw_glob_escape,"'")."'")
-  call setline(tmpfileescline,"let g:netrw_tmpfile_escape    = '".escape(g:netrw_tmpfile_escape,"'")."'")
+  " Put in shq setting.
+  " (deferred so as to avoid the quote manipulation just preceding)
+  if g:netrw_shq == "'"
+   call setline(shqline,'let g:netrw_shq               = "'.g:netrw_shq.'"')
+  else
+   call setline(shqline,"let g:netrw_shq               = '".g:netrw_shq."'")
+  endif

  set nomod

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	PHP
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2011 Dec 08
+" Last Change:	2006 May 9
 "
 "   TODO:
 "   - Class aware completion:
@@ -650,7 +650,6 @@ function! phpcomplete#GetClassContents(file, name) " {{{
 	" this is the most efficient way. The other way
 	" is to go through the looong string looking for
 	" matching {}
-	let original_window = winnr()
 	below 1new
 	0put =cfile
 	call search('class\s\+'.a:name)
@@ -668,9 +667,6 @@ function! phpcomplete#GetClassContents(file, name) " {{{
 	let classcontent = join(classc, "\n")

 	bw! %
-	" go back to where we started
-	exe original_window.'wincmd w'
-
 	if extends_class != ''
 		let classlocation = phpcomplete#GetClassLocation(extends_class)
 		if filereadable(classlocation)
@@ -1,606 +0,0 @@
-"python3complete.vim - Omni Completion for python
-" Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
-" Version: 0.9
-" Last Updated: 18 Jun 2009
-"
-" Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
-"
-" Changes
-" TODO:
-" 'info' item output can use some formatting work
-" Add an "unsafe eval" mode, to allow for return type evaluation
-" Complete basic syntax along with import statements
-"   i.e. "import url<c-x,c-o>"
-" Continue parsing on invalid line??
-"
-" v 0.9
-"   * Fixed docstring parsing for classes and functions
-"   * Fixed parsing of *args and **kwargs type arguments
-"   * Better function param parsing to handle things like tuples and
-"     lambda defaults args
-"
-" v 0.8
-"   * Fixed an issue where the FIRST assignment was always used instead of
-"   using a subsequent assignment for a variable
-"   * Fixed a scoping issue when working inside a parameterless function
-"
-"
-" v 0.7
-"   * Fixed function list sorting (_ and __ at the bottom)
-"   * Removed newline removal from docs.  It appears vim handles these better in
-"   recent patches
-"
-" v 0.6:
-"   * Fixed argument completion
-"   * Removed the 'kind' completions, as they are better indicated
-"   with real syntax
-"   * Added tuple assignment parsing (whoops, that was forgotten)
-"   * Fixed import handling when flattening scope
-"
-" v 0.5:
-" Yeah, I skipped a version number - 0.4 was never public.
-"  It was a bugfix version on top of 0.3.  This is a complete
-"  rewrite.
-"
-
-if !has('python3')
-    echo "Error: Required vim compiled with +python3"
-    finish
-endif
-
-function! python3complete#Complete(findstart, base)
-    "findstart = 1 when we need to get the text length
-    if a:findstart == 1
-        let line = getline('.')
-        let idx = col('.')
-        while idx > 0
-            let idx -= 1
-            let c = line[idx]
-            if c =~ '\w'
-                continue
-            elseif ! c =~ '\.'
-                let idx = -1
-                break
-            else
-                break
-            endif
-        endwhile
-
-        return idx
-    "findstart = 0 when we need to return the list of completions
-    else
-        "vim no longer moves the cursor upon completion... fix that
-        let line = getline('.')
-        let idx = col('.')
-        let cword = ''
-        while idx > 0
-            let idx -= 1
-            let c = line[idx]
-            if c =~ '\w' || c =~ '\.'
-                let cword = c . cword
-                continue
-            elseif strlen(cword) > 0 || idx == 0
-                break
-            endif
-        endwhile
-        execute "py3 vimpy3complete('" . cword . "', '" . a:base . "')"
-        return g:python3complete_completions
-    endif
-endfunction
-
-function! s:DefPython()
-py3 << PYTHONEOF
-import sys, tokenize, io, types
-from token import NAME, DEDENT, NEWLINE, STRING
-
-debugstmts=[]
-def dbg(s): debugstmts.append(s)
-def showdbg():
-    for d in debugstmts: print("DBG: %s " % d)
-
-def vimpy3complete(context,match):
-    global debugstmts
-    debugstmts = []
-    try:
-        import vim
-        cmpl = Completer()
-        cmpl.evalsource('\n'.join(vim.current.buffer),vim.eval("line('.')"))
-        all = cmpl.get_completions(context,match)
-        all.sort(key=lambda x:x['abbr'].replace('_','z'))
-        dictstr = '['
-        # have to do this for double quoting
-        for cmpl in all:
-            dictstr += '{'
-            for x in cmpl: dictstr += '"%s":"%s",' % (x,cmpl[x])
-            dictstr += '"icase":0},'
-        if dictstr[-1] == ',': dictstr = dictstr[:-1]
-        dictstr += ']'
-        #dbg("dict: %s" % dictstr)
-        vim.command("silent let g:python3complete_completions = %s" % dictstr)
-        #dbg("Completion dict:\n%s" % all)
-    except vim.error:
-        dbg("VIM Error: %s" % vim.error)
-
-class Completer(object):
-    def __init__(self):
-       self.compldict = {}
-       self.parser = PyParser()
-
-    def evalsource(self,text,line=0):
-        sc = self.parser.parse(text,line)
-        src = sc.get_code()
-        dbg("source: %s" % src)
-        try: exec(src,self.compldict)
-        except: dbg("parser: %s, %s" % (sys.exc_info()[0],sys.exc_info()[1]))
-        for l in sc.locals:
-            try: exec(l,self.compldict)
-            except: dbg("locals: %s, %s [%s]" % (sys.exc_info()[0],sys.exc_info()[1],l))
-
-    def _cleanstr(self,doc):
-        return doc.replace('"',' ').replace("'",' ')
-
-    def get_arguments(self,func_obj):
-        def _ctor(class_ob):
-            try: return class_ob.__init__
-            except AttributeError:
-                for base in class_ob.__bases__:
-                    rc = _ctor(base)
-                    if rc is not None: return rc
-            return None
-
-        arg_offset = 1
-        if type(func_obj) == type: func_obj = _ctor(func_obj)
-        elif type(func_obj) == types.MethodType: arg_offset = 1
-        else: arg_offset = 0
-
-        arg_text=''
-        if type(func_obj) in [types.FunctionType, types.LambdaType,types.MethodType]:
-            try:
-                cd = func_obj.__code__
-                real_args = cd.co_varnames[arg_offset:cd.co_argcount]
-                defaults = func_obj.__defaults__ or []
-                defaults = ["=%s" % name for name in defaults]
-                defaults = [""] * (len(real_args)-len(defaults)) + defaults
-                items = [a+d for a,d in zip(real_args,defaults)]
-                if func_obj.__code__.co_flags & 0x4:
-                    items.append("...")
-                if func_obj.__code__.co_flags & 0x8:
-                    items.append("***")
-                arg_text = (','.join(items)) + ')'
-            except:
-                dbg("arg completion: %s: %s" % (sys.exc_info()[0],sys.exc_info()[1]))
-                pass
-        if len(arg_text) == 0:
-            # The doc string sometimes contains the function signature
-            #  this works for alot of C modules that are part of the
-            #  standard library
-            doc = func_obj.__doc__
-            if doc:
-                doc = doc.lstrip()
-                pos = doc.find('\n')
-                if pos > 0:
-                    sigline = doc[:pos]
-                    lidx = sigline.find('(')
-                    ridx = sigline.find(')')
-                    if lidx > 0 and ridx > 0:
-                        arg_text = sigline[lidx+1:ridx] + ')'
-        if len(arg_text) == 0: arg_text = ')'
-        return arg_text
-
-    def get_completions(self,context,match):
-        #dbg("get_completions('%s','%s')" % (context,match))
-        stmt = ''
-        if context: stmt += str(context)
-        if match: stmt += str(match)
-        try:
-            result = None
-            all = {}
-            ridx = stmt.rfind('.')
-            if len(stmt) > 0 and stmt[-1] == '(':
-                result = eval(_sanitize(stmt[:-1]), self.compldict)
-                doc = result.__doc__
-                if doc is None: doc = ''
-                args = self.get_arguments(result)
-                return [{'word':self._cleanstr(args),'info':self._cleanstr(doc)}]
-            elif ridx == -1:
-                match = stmt
-                all = self.compldict
-            else:
-                match = stmt[ridx+1:]
-                stmt = _sanitize(stmt[:ridx])
-                result = eval(stmt, self.compldict)
-                all = dir(result)
-
-            dbg("completing: stmt:%s" % stmt)
-            completions = []
-
-            try: maindoc = result.__doc__
-            except: maindoc = ' '
-            if maindoc is None: maindoc = ' '
-            for m in all:
-                if m == "_PyCmplNoType": continue #this is internal
-                try:
-                    dbg('possible completion: %s' % m)
-                    if m.find(match) == 0:
-                        if result is None: inst = all[m]
-                        else: inst = getattr(result,m)
-                        try: doc = inst.__doc__
-                        except: doc = maindoc
-                        typestr = str(inst)
-                        if doc is None or doc == '': doc = maindoc
-
-                        wrd = m[len(match):]
-                        c = {'word':wrd, 'abbr':m,  'info':self._cleanstr(doc)}
-                        if "function" in typestr:
-                            c['word'] += '('
-                            c['abbr'] += '(' + self._cleanstr(self.get_arguments(inst))
-                        elif "method" in typestr:
-                            c['word'] += '('
-                            c['abbr'] += '(' + self._cleanstr(self.get_arguments(inst))
-                        elif "module" in typestr:
-                            c['word'] += '.'
-                        elif "type" in typestr:
-                            c['word'] += '('
-                            c['abbr'] += '('
-                        completions.append(c)
-                except:
-                    i = sys.exc_info()
-                    dbg("inner completion: %s,%s [stmt='%s']" % (i[0],i[1],stmt))
-            return completions
-        except:
-            i = sys.exc_info()
-            dbg("completion: %s,%s [stmt='%s']" % (i[0],i[1],stmt))
-            return []
-
-class Scope(object):
-    def __init__(self,name,indent,docstr=''):
-        self.subscopes = []
-        self.docstr = docstr
-        self.locals = []
-        self.parent = None
-        self.name = name
-        self.indent = indent
-
-    def add(self,sub):
-        #print('push scope: [%s@%s]' % (sub.name,sub.indent))
-        sub.parent = self
-        self.subscopes.append(sub)
-        return sub
-
-    def doc(self,str):
-        """ Clean up a docstring """
-        d = str.replace('\n',' ')
-        d = d.replace('\t',' ')
-        while d.find('  ') > -1: d = d.replace('  ',' ')
-        while d[0] in '"\'\t ': d = d[1:]
-        while d[-1] in '"\'\t ': d = d[:-1]
-        dbg("Scope(%s)::docstr = %s" % (self,d))
-        self.docstr = d
-
-    def local(self,loc):
-        self._checkexisting(loc)
-        self.locals.append(loc)
-
-    def copy_decl(self,indent=0):
-        """ Copy a scope's declaration only, at the specified indent level - not local variables """
-        return Scope(self.name,indent,self.docstr)
-
-    def _checkexisting(self,test):
-        "Convienance function... keep out duplicates"
-        if test.find('=') > -1:
-            var = test.split('=')[0].strip()
-            for l in self.locals:
-                if l.find('=') > -1 and var == l.split('=')[0].strip():
-                    self.locals.remove(l)
-
-    def get_code(self):
-        str = ""
-        if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
-        for l in self.locals:
-            if l.startswith('import'): str += l+'\n'
-        str += 'class _PyCmplNoType:\n    def __getattr__(self,name):\n        return None\n'
-        for sub in self.subscopes:
-            str += sub.get_code()
-        for l in self.locals:
-            if not l.startswith('import'): str += l+'\n'
-
-        return str
-
-    def pop(self,indent):
-        #print('pop scope: [%s] to [%s]' % (self.indent,indent))
-        outer = self
-        while outer.parent != None and outer.indent >= indent:
-            outer = outer.parent
-        return outer
-
-    def currentindent(self):
-        #print('parse current indent: %s' % self.indent)
-        return '    '*self.indent
-
-    def childindent(self):
-        #print('parse child indent: [%s]' % (self.indent+1))
-        return '    '*(self.indent+1)
-
-class Class(Scope):
-    def __init__(self, name, supers, indent, docstr=''):
-        Scope.__init__(self,name,indent, docstr)
-        self.supers = supers
-    def copy_decl(self,indent=0):
-        c = Class(self.name,self.supers,indent, self.docstr)
-        for s in self.subscopes:
-            c.add(s.copy_decl(indent+1))
-        return c
-    def get_code(self):
-        str = '%sclass %s' % (self.currentindent(),self.name)
-        if len(self.supers) > 0: str += '(%s)' % ','.join(self.supers)
-        str += ':\n'
-        if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
-        if len(self.subscopes) > 0:
-            for s in self.subscopes: str += s.get_code()
-        else:
-            str += '%spass\n' % self.childindent()
-        return str
-
-
-class Function(Scope):
-    def __init__(self, name, params, indent, docstr=''):
-        Scope.__init__(self,name,indent, docstr)
-        self.params = params
-    def copy_decl(self,indent=0):
-        return Function(self.name,self.params,indent, self.docstr)
-    def get_code(self):
-        str = "%sdef %s(%s):\n" % \
-            (self.currentindent(),self.name,','.join(self.params))
-        if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
-        str += "%spass\n" % self.childindent()
-        return str
-
-class PyParser:
-    def __init__(self):
-        self.top = Scope('global',0)
-        self.scope = self.top
-
-    def _parsedotname(self,pre=None):
-        #returns (dottedname, nexttoken)
-        name = []
-        if pre is None:
-            tokentype, token, indent = self.donext()
-            if tokentype != NAME and token != '*':
-                return ('', token)
-        else: token = pre
-        name.append(token)
-        while True:
-            tokentype, token, indent = self.donext()
-            if token != '.': break
-            tokentype, token, indent = self.donext()
-            if tokentype != NAME: break
-            name.append(token)
-        return (".".join(name), token)
-
-    def _parseimportlist(self):
-        imports = []
-        while True:
-            name, token = self._parsedotname()
-            if not name: break
-            name2 = ''
-            if token == 'as': name2, token = self._parsedotname()
-            imports.append((name, name2))
-            while token != "," and "\n" not in token:
-                tokentype, token, indent = self.donext()
-            if token != ",": break
-        return imports
-
-    def _parenparse(self):
-        name = ''
-        names = []
-        level = 1
-        while True:
-            tokentype, token, indent = self.donext()
-            if token in (')', ',') and level == 1:
-                if '=' not in name: name = name.replace(' ', '')
-                names.append(name.strip())
-                name = ''
-            if token == '(':
-                level += 1
-                name += "("
-            elif token == ')':
-                level -= 1
-                if level == 0: break
-                else: name += ")"
-            elif token == ',' and level == 1:
-                pass
-            else:
-                name += "%s " % str(token)
-        return names
-
-    def _parsefunction(self,indent):
-        self.scope=self.scope.pop(indent)
-        tokentype, fname, ind = self.donext()
-        if tokentype != NAME: return None
-
-        tokentype, open, ind = self.donext()
-        if open != '(': return None
-        params=self._parenparse()
-
-        tokentype, colon, ind = self.donext()
-        if colon != ':': return None
-
-        return Function(fname,params,indent)
-
-    def _parseclass(self,indent):
-        self.scope=self.scope.pop(indent)
-        tokentype, cname, ind = self.donext()
-        if tokentype != NAME: return None
-
-        super = []
-        tokentype, thenext, ind = self.donext()
-        if thenext == '(':
-            super=self._parenparse()
-        elif thenext != ':': return None
-
-        return Class(cname,super,indent)
-
-    def _parseassignment(self):
-        assign=''
-        tokentype, token, indent = self.donext()
-        if tokentype == tokenize.STRING or token == 'str':  
-            return '""'
-        elif token == '(' or token == 'tuple':
-            return '()'
-        elif token == '[' or token == 'list':
-            return '[]'
-        elif token == '{' or token == 'dict':
-            return '{}'
-        elif tokentype == tokenize.NUMBER:
-            return '0'
-        elif token == 'open' or token == 'file':
-            return 'file'
-        elif token == 'None':
-            return '_PyCmplNoType()'
-        elif token == 'type':
-            return 'type(_PyCmplNoType)' #only for method resolution
-        else:
-            assign += token
-            level = 0
-            while True:
-                tokentype, token, indent = self.donext()
-                if token in ('(','{','['):
-                    level += 1
-                elif token in (']','}',')'):
-                    level -= 1
-                    if level == 0: break
-                elif level == 0:
-                    if token in (';','\n'): break
-                    assign += token
-        return "%s" % assign
-
-    def donext(self):
-        type, token, (lineno, indent), end, self.parserline = next(self.gen)
-        if lineno == self.curline:
-            #print('line found [%s] scope=%s' % (line.replace('\n',''),self.scope.name))
-            self.currentscope = self.scope
-        return (type, token, indent)
-
-    def _adjustvisibility(self):
-        newscope = Scope('result',0)
-        scp = self.currentscope
-        while scp != None:
-            if type(scp) == Function:
-                slice = 0
-                #Handle 'self' params
-                if scp.parent != None and type(scp.parent) == Class:
-                    slice = 1
-                    newscope.local('%s = %s' % (scp.params[0],scp.parent.name))
-                for p in scp.params[slice:]:
-                    i = p.find('=')
-                    if len(p) == 0: continue
-                    pvar = ''
-                    ptype = ''
-                    if i == -1:
-                        pvar = p
-                        ptype = '_PyCmplNoType()'
-                    else:
-                        pvar = p[:i]
-                        ptype = _sanitize(p[i+1:])
-                    if pvar.startswith('**'):
-                        pvar = pvar[2:]
-                        ptype = '{}'
-                    elif pvar.startswith('*'):
-                        pvar = pvar[1:]
-                        ptype = '[]'
-
-                    newscope.local('%s = %s' % (pvar,ptype))
-
-            for s in scp.subscopes:
-                ns = s.copy_decl(0)
-                newscope.add(ns)
-            for l in scp.locals: newscope.local(l)
-            scp = scp.parent
-
-        self.currentscope = newscope
-        return self.currentscope
-
-    #p.parse(vim.current.buffer[:],vim.eval("line('.')"))
-    def parse(self,text,curline=0):
-        self.curline = int(curline)
-        buf = io.StringIO(''.join(text) + '\n')
-        self.gen = tokenize.generate_tokens(buf.readline)
-        self.currentscope = self.scope
-
-        try:
-            freshscope=True
-            while True:
-                tokentype, token, indent = self.donext()
-                #dbg( 'main: token=[%s] indent=[%s]' % (token,indent))
-
-                if tokentype == DEDENT or token == "pass":
-                    self.scope = self.scope.pop(indent)
-                elif token == 'def':
-                    func = self._parsefunction(indent)
-                    if func is None:
-                        print("function: syntax error...")
-                        continue
-                    dbg("new scope: function")
-                    freshscope = True
-                    self.scope = self.scope.add(func)
-                elif token == 'class':
-                    cls = self._parseclass(indent)
-                    if cls is None:
-                        print("class: syntax error...")
-                        continue
-                    freshscope = True
-                    dbg("new scope: class")
-                    self.scope = self.scope.add(cls)
-                    
-                elif token == 'import':
-                    imports = self._parseimportlist()
-                    for mod, alias in imports:
-                        loc = "import %s" % mod
-                        if len(alias) > 0: loc += " as %s" % alias
-                        self.scope.local(loc)
-                    freshscope = False
-                elif token == 'from':
-                    mod, token = self._parsedotname()
-                    if not mod or token != "import":
-                        print("from: syntax error...")
-                        continue
-                    names = self._parseimportlist()
-                    for name, alias in names:
-                        loc = "from %s import %s" % (mod,name)
-                        if len(alias) > 0: loc += " as %s" % alias
-                        self.scope.local(loc)
-                    freshscope = False
-                elif tokentype == STRING:
-                    if freshscope: self.scope.doc(token)
-                elif tokentype == NAME:
-                    name,token = self._parsedotname(token) 
-                    if token == '=':
-                        stmt = self._parseassignment()
-                        dbg("parseassignment: %s = %s" % (name, stmt))
-                        if stmt != None:
-                            self.scope.local("%s = %s" % (name,stmt))
-                    freshscope = False
-        except StopIteration: #thrown on EOF
-            pass
-        except:
-            dbg("parse error: %s, %s @ %s" %
-                (sys.exc_info()[0], sys.exc_info()[1], self.parserline))
-        return self._adjustvisibility()
-
-def _sanitize(str):
-    val = ''
-    level = 0
-    for c in str:
-        if c in ('(','{','['):
-            level += 1
-        elif c in (']','}',')'):
-            level -= 1
-        elif level == 0:
-            val += c
-    return val
-
-sys.path.extend(['.','..'])
-PYTHONEOF
-endfunction
-
-call s:DefPython()
@@ -1,28 +1,17 @@
 "pythoncomplete.vim - Omni Completion for python
 " Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
-" Version: 0.9
-" Last Updated: 18 Jun 2009
+" Version: 0.7
+" Last Updated: 19 Oct 2006
 "
 " Changes
 " TODO:
+" User defined docstrings aren't handled right...
 " 'info' item output can use some formatting work
 " Add an "unsafe eval" mode, to allow for return type evaluation
 " Complete basic syntax along with import statements
 "   i.e. "import url<c-x,c-o>"
 " Continue parsing on invalid line??
 "
-" v 0.9
-"   * Fixed docstring parsing for classes and functions
-"   * Fixed parsing of *args and **kwargs type arguments
-"   * Better function param parsing to handle things like tuples and
-"     lambda defaults args
-"
-" v 0.8
-"   * Fixed an issue where the FIRST assignment was always used instead of
-"   using a subsequent assignment for a variable
-"   * Fixed a scoping issue when working inside a parameterless function
-"
-"
 " v 0.7
 "   * Fixed function list sorting (_ and __ at the bottom)
 "   * Removed newline removal from docs.  It appears vim handles these better in
@@ -74,7 +63,7 @@ function! pythoncomplete#Complete(findstart, base)
        while idx > 0
            let idx -= 1
            let c = line[idx]
-            if c =~ '\w' || c =~ '\.'
+            if c =~ '\w' || c =~ '\.' || c == '('
                let cword = c . cword
                continue
            elseif strlen(cword) > 0 || idx == 0
@@ -217,7 +206,7 @@ class Completer(object):
            if len(stmt) > 0 and stmt[-1] == '(':
                result = eval(_sanitize(stmt[:-1]), self.compldict)
                doc = result.__doc__
-                if doc is None: doc = ''
+                if doc == None: doc = ''
                args = self.get_arguments(result)
                return [{'word':self._cleanstr(args),'info':self._cleanstr(doc)}]
            elif ridx == -1:
@@ -234,18 +223,18 @@ class Completer(object):

            try: maindoc = result.__doc__
            except: maindoc = ' '
-            if maindoc is None: maindoc = ' '
+            if maindoc == None: maindoc = ' '
            for m in all:
                if m == "_PyCmplNoType": continue #this is internal
                try:
                    dbg('possible completion: %s' % m)
                    if m.find(match) == 0:
-                        if result is None: inst = all[m]
+                        if result == None: inst = all[m]
                        else: inst = getattr(result,m)
                        try: doc = inst.__doc__
                        except: doc = maindoc
                        typestr = str(inst)
-                        if doc is None or doc == '': doc = maindoc
+                        if doc == None or doc == '': doc = maindoc

                        wrd = m[len(match):]
                        c = {'word':wrd, 'abbr':m,  'info':self._cleanstr(doc)}
@@ -271,9 +260,9 @@ class Completer(object):
            return []

 class Scope(object):
-    def __init__(self,name,indent,docstr=''):
+    def __init__(self,name,indent):
        self.subscopes = []
-        self.docstr = docstr
+        self.docstr = ''
        self.locals = []
        self.parent = None
        self.name = name
@@ -292,28 +281,29 @@ class Scope(object):
        while d.find('  ') > -1: d = d.replace('  ',' ')
        while d[0] in '"\'\t ': d = d[1:]
        while d[-1] in '"\'\t ': d = d[:-1]
-        dbg("Scope(%s)::docstr = %s" % (self,d))
        self.docstr = d

    def local(self,loc):
-        self._checkexisting(loc)
-        self.locals.append(loc)
+        if not self._hasvaralready(loc):
+            self.locals.append(loc)

    def copy_decl(self,indent=0):
        """ Copy a scope's declaration only, at the specified indent level - not local variables """
-        return Scope(self.name,indent,self.docstr)
+        return Scope(self.name,indent)

-    def _checkexisting(self,test):
+    def _hasvaralready(self,test):
        "Convienance function... keep out duplicates"
        if test.find('=') > -1:
            var = test.split('=')[0].strip()
            for l in self.locals:
                if l.find('=') > -1 and var == l.split('=')[0].strip():
-                    self.locals.remove(l)
+                    return True
+        return False

    def get_code(self):
-        str = ""
-        if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
+        # we need to start with this, to fix up broken completions
+        # hopefully this name is unique enough...
+        str = '"""'+self.docstr+'"""\n'
        for l in self.locals:
            if l.startswith('import'): str += l+'\n'
        str += 'class _PyCmplNoType:\n    def __getattr__(self,name):\n        return None\n'
@@ -340,11 +330,11 @@ class Scope(object):
        return '    '*(self.indent+1)

 class Class(Scope):
-    def __init__(self, name, supers, indent, docstr=''):
-        Scope.__init__(self,name,indent, docstr)
+    def __init__(self, name, supers, indent):
+        Scope.__init__(self,name,indent)
        self.supers = supers
    def copy_decl(self,indent=0):
-        c = Class(self.name,self.supers,indent, self.docstr)
+        c = Class(self.name,self.supers,indent)
        for s in self.subscopes:
            c.add(s.copy_decl(indent+1))
        return c
@@ -361,11 +351,11 @@ class Class(Scope):


 class Function(Scope):
-    def __init__(self, name, params, indent, docstr=''):
-        Scope.__init__(self,name,indent, docstr)
+    def __init__(self, name, params, indent):
+        Scope.__init__(self,name,indent)
        self.params = params
    def copy_decl(self,indent=0):
-        return Function(self.name,self.params,indent, self.docstr)
+        return Function(self.name,self.params,indent)
    def get_code(self):
        str = "%sdef %s(%s):\n" % \
            (self.currentindent(),self.name,','.join(self.params))
@@ -381,7 +371,7 @@ class PyParser:
    def _parsedotname(self,pre=None):
        #returns (dottedname, nexttoken)
        name = []
-        if pre is None:
+        if pre == None:
            tokentype, token, indent = self.next()
            if tokentype != NAME and token != '*':
                return ('', token)
@@ -415,20 +405,17 @@ class PyParser:
        while True:
            tokentype, token, indent = self.next()
            if token in (')', ',') and level == 1:
-                if '=' not in name: name = name.replace(' ', '')
-                names.append(name.strip())
+                names.append(name)
                name = ''
            if token == '(':
                level += 1
-                name += "("
            elif token == ')':
                level -= 1
                if level == 0: break
-                else: name += ")"
            elif token == ',' and level == 1:
                pass
            else:
-                name += "%s " % str(token)
+                name += str(token)
        return names

    def _parsefunction(self,indent):
@@ -508,26 +495,16 @@ class PyParser:
                #Handle 'self' params
                if scp.parent != None and type(scp.parent) == Class:
                    slice = 1
+                    p = scp.params[0]
+                    i = p.find('=')
+                    if i != -1: p = p[:i]
                    newscope.local('%s = %s' % (scp.params[0],scp.parent.name))
                for p in scp.params[slice:]:
                    i = p.find('=')
-                    if len(p) == 0: continue
-                    pvar = ''
-                    ptype = ''
                    if i == -1:
-                        pvar = p
-                        ptype = '_PyCmplNoType()'
+                        newscope.local('%s = _PyCmplNoType()' % p)
                    else:
-                        pvar = p[:i]
-                        ptype = _sanitize(p[i+1:])
-                    if pvar.startswith('**'):
-                        pvar = pvar[2:]
-                        ptype = '{}'
-                    elif pvar.startswith('*'):
-                        pvar = pvar[1:]
-                        ptype = '[]'
-
-                    newscope.local('%s = %s' % (pvar,ptype))
+                        newscope.local('%s = %s' % (p[:i],_sanitize(p[i+1])))

            for s in scp.subscopes:
                ns = s.copy_decl(0)
@@ -555,19 +532,17 @@ class PyParser:
                    self.scope = self.scope.pop(indent)
                elif token == 'def':
                    func = self._parsefunction(indent)
-                    if func is None:
+                    if func == None:
                        print "function: syntax error..."
                        continue
-                    dbg("new scope: function")
                    freshscope = True
                    self.scope = self.scope.add(func)
                elif token == 'class':
                    cls = self._parseclass(indent)
-                    if cls is None:
+                    if cls == None:
                        print "class: syntax error..."
                        continue
                    freshscope = True
-                    dbg("new scope: class")
                    self.scope = self.scope.add(cls)
                    
                elif token == 'import':
@@ -594,7 +569,6 @@ class PyParser:
                    name,token = self._parsedotname(token) 
                    if token == '=':
                        stmt = self._parseassignment()
-                        dbg("parseassignment: %s = %s" % (name, stmt))
                        if stmt != None:
                            self.scope.local("%s = %s" % (name,stmt))
                    freshscope = False
@@ -1,32 +1,27 @@
 " Vim completion script
 " Language:             Ruby
 " Maintainer:           Mark Guzman <segfault@hasno.info>
-" URL:                  https://github.com/vim-ruby/vim-ruby
+" Info:                 $Id$
+" URL:                  http://vim-ruby.rubyforge.org
+" Anon CVS:             See above site
 " Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
-" Maintainer Version:   0.8.1
+" Maintainer Version:   0.8
 " ----------------------------------------------------------------------------
 "
 " Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
 " ----------------------------------------------------------------------------

 " {{{ requirement checks
-
-function! s:ErrMsg(msg)
-    echohl ErrorMsg
-    echo a:msg
-    echohl None
-endfunction
-
 if !has('ruby')
-    call s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
-    call s:ErrMsg( "Error: falling back to syntax completion" )
+    s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
+    s:ErrMsg( "Error: falling back to syntax completion" )
    " lets fall back to syntax completion
    setlocal omnifunc=syntaxcomplete#Complete
    finish
 endif

 if version < 700
-    call s:ErrMsg( "Error: Required vim >= 7.0" )
+    s:ErrMsg( "Error: Required vim >= 7.0" )
    finish
 endif
 " }}} requirement checks
@@ -41,7 +36,7 @@ if !exists("g:rubycomplete_classes_in_global")
 endif

 if !exists("g:rubycomplete_buffer_loading")
-    let g:rubycomplete_buffer_loading = 0
+    let g:rubycomplete_classes_in_global = 0
 endif

 if !exists("g:rubycomplete_include_object")
@@ -56,6 +51,12 @@ endif
 " {{{ vim-side support functions
 let s:rubycomplete_debug = 0

+function! s:ErrMsg(msg)
+    echohl ErrorMsg
+    echo a:msg
+    echohl None
+endfunction
+
 function! s:dprint(msg)
    if s:rubycomplete_debug == 1
        echom a:msg
@@ -132,7 +133,7 @@ function! s:GetRubyVarType(v)
    let stopline = 1
    let vtp = ''
    let pos = getpos('.')
-    let sstr = '^\s*#\s*@var\s*'.escape(a:v, '*').'\>\s\+[^ \t]\+\s*$'
+    let sstr = '^\s*#\s*@var\s*'.a:v.'\>\s\+[^ \t]\+\s*$'
    let [lnum,lcol] = searchpos(sstr,'nb',stopline)
    if lnum != 0 && lcol != 0
        call setpos('.',pos)
@@ -274,7 +275,7 @@ class VimRubyCompletion
    pare = /^\s*class\s*(.*)\s*<\s*(.*)\s*\n/.match( classdef )
    load_buffer_class( $2 ) if pare != nil  && $2 != name # load parent class if needed

-    mixre = /.*\n\s*(include|prepend)\s*(.*)\s*\n/.match( classdef )
+    mixre = /.*\n\s*include\s*(.*)\s*\n/.match( classdef )
    load_buffer_module( $2 ) if mixre != nil && $2 != name # load mixins if needed

    begin
@@ -300,7 +301,7 @@ class VimRubyCompletion

  def get_buffer_entity(name, vimfun)
    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
-    return nil if loading_allowed.to_i.zero?
+    return nil if loading_allowed != '1'
    return nil if /(\"|\')+/.match( name )
    buf = VIM::Buffer.current
    nums = eval( VIM::evaluate( vimfun % name ) )
@@ -324,7 +325,7 @@ class VimRubyCompletion
          ln = buf[x]
          if /^\s*(module|class|def|include)\s+/.match(ln)
            clscnt += 1 if $1 == "class"
-            #dprint "\$1$1
+            #dprint "\$1: %s" % $1
            classdef += "%s\n" % ln
            classdef += "end\n" if /def\s+/.match(ln)
            dprint ln
@@ -363,15 +364,11 @@ class VimRubyCompletion
    print txt if @@debug
  end

-  def escape_vim_singlequote_string(str)
-    str.to_s.gsub(/'/,"\\'")
-  end
-
  def get_buffer_entity_list( type )
    # this will be a little expensive.
    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
    allow_aggressive_load = VIM::evaluate("exists('g:rubycomplete_classes_in_global') && g:rubycomplete_classes_in_global")
-    return [] if allow_aggressive_load.to_i.zero? || loading_allowed.to_i.zero?
+    return [] if allow_aggressive_load != '1' || loading_allowed != '1'

    buf = VIM::Buffer.current
    eob = buf.length
@@ -404,7 +401,7 @@ class VimRubyCompletion

  def load_rails
    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
-    return if allow_rails.to_i.zero?
+    return if allow_rails != '1'

    buf_path = VIM::evaluate('expand("%:p")')
    file_name = VIM::evaluate('expand("%:t")')
@@ -464,7 +461,7 @@ class VimRubyCompletion
  def get_rails_helpers
    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
    rails_loaded = VIM::evaluate('s:rubycomplete_rails_loaded')
-    return [] if allow_rails.to_i.zero? || rails_loaded.to_i.zero?
+    return [] if allow_rails != '1' || rails_loaded != '1'

    buf_path = VIM::evaluate('expand("%:p")')
    buf_path.gsub!( /\\/, "/" )
@@ -514,7 +511,7 @@ class VimRubyCompletion
  def add_rails_columns( cls )
    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
    rails_loaded = VIM::evaluate('s:rubycomplete_rails_loaded')
-    return [] if allow_rails.to_i.zero? || rails_loaded.to_i.zero?
+    return [] if allow_rails != '1' || rails_loaded != '1'

    begin
        eval( "#{cls}.establish_connection" )
@@ -529,15 +526,15 @@ class VimRubyCompletion
  end

  def clean_sel(sel, msg)
-    ret = sel.reject{|x|x.nil?}.uniq
-    ret = ret.grep(/^#{Regexp.quote(msg)}/) if msg != nil
-    ret
+    sel.delete_if { |x| x == nil }
+    sel.uniq!
+    sel.grep(/^#{Regexp.quote(msg)}/) if msg != nil
  end

  def get_rails_view_methods
    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
    rails_loaded = VIM::evaluate('s:rubycomplete_rails_loaded')
-    return [] if allow_rails.to_i.zero? || rails_loaded.to_i.zero?
+    return [] if allow_rails != '1' || rails_loaded != '1'

    buf_path = VIM::evaluate('expand("%:p")')
    buf_path.gsub!( /\\/, "/" )
@@ -583,7 +580,7 @@ class VimRubyCompletion

  def get_completions(base)
    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
-    if loading_allowed.to_i == 1
+    if loading_allowed == '1'
      load_requires
      load_rails
    end
@@ -635,7 +632,7 @@ class VimRubyCompletion
        methods = Object.constants
        methods.grep(/^#{receiver}/).collect{|e| "::" + e}

-      when /^(((::)?[A-Z][^:.\(]*)+?)::?([^:.]*)$/ # Constant or class methods
+      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/ # Constant or class methods
        receiver = $1
        message = Regexp.quote($4)
        dprint "const or cls 2 [recv: \'%s\', msg: \'%s\']" % [ receiver, message ]
@@ -669,7 +666,7 @@ class VimRubyCompletion
        dprint "global"
        methods = global_variables.grep(Regexp.new(Regexp.quote($1)))

-      when /^((\.?[^.]+)+?)\.([^.]*)$/ # variable
+      when /^((\.?[^.]+)+)\.([^.]*)$/ # variable
        dprint "variable"
        receiver = $1
        message = Regexp.quote($3)
@@ -770,10 +767,10 @@ class VimRubyCompletion
    constants = clean_sel( constants, message )

    valid = []
-    valid += methods.collect { |m| { :name => m.to_s, :type => 'm' } }
-    valid += variables.collect { |v| { :name => v.to_s, :type => 'v' } }
-    valid += classes.collect { |c| { :name => c.to_s, :type => 't' } }
-    valid += constants.collect { |d| { :name => d.to_s, :type => 'd' } }
+    valid += methods.collect { |m| { :name => m, :type => 'm' } }
+    valid += variables.collect { |v| { :name => v, :type => 'v' } }
+    valid += classes.collect { |c| { :name => c, :type => 't' } }
+    valid += constants.collect { |d| { :name => d, :type => 'd' } }
    valid.sort! { |x,y| x[:name] <=> y[:name] }

    outp = ""
@@ -782,7 +779,7 @@ class VimRubyCompletion
    rg.step(150) do |x|
      stpos = 0+x
      enpos = 150+x
-      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ].map{|x|escape_vim_singlequote_string(x)} }
+      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ] }
      outp.sub!(/,$/, '')

      VIM::command("call extend(g:rubycomplete_completions, [%s])" % outp)
@@ -1,15 +1,9 @@
 " Vim script to download a missing spell file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Jan 08
+" Last Change:	2007 May 08

 if !exists('g:spellfile_URL')
-  " Prefer using http:// when netrw should be able to use it, since
-  " more firewalls let this through.
-  if executable("curl") || executable("wget") || executable("fetch")
-    let g:spellfile_URL = 'http://ftp.vim.org/pub/vim/runtime/spell'
-  else
-    let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
-  endif
+  let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
 endif
 let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.

@@ -39,22 +33,19 @@ function! spellfile#LoadFile(lang)
  let s:donedict[a:lang . &enc] = 1

  " Find spell directories we can write in.
-  let [dirlist, dirchoices] = spellfile#GetDirChoices()
+  let dirlist = []
+  let dirchoices = '&Cancel'
+  for dir in split(globpath(&rtp, 'spell'), "\n")
+    if filewritable(dir) == 2
+      call add(dirlist, dir)
+      let dirchoices .= "\n&" . len(dirlist)
+    endif
+  endfor
  if len(dirlist) == 0
-    let dir_to_create = spellfile#WritableSpellDir()
-    if &verbose || dir_to_create != ''
+    if &verbose
      echomsg 'spellfile#LoadFile(): There is no writable spell directory.'
    endif
-    if dir_to_create != ''
-      if confirm("Shall I create " . dir_to_create, "&Yes\n&No", 2) == 1
-	" After creating the directory it should show up in the list.
-	call mkdir(dir_to_create, "p")
-	let [dirlist, dirchoices] = spellfile#GetDirChoices()
-      endif
-    endif
-    if len(dirlist) == 0
-      return
-    endif
+    return
  endif

  let msg = 'Cannot find spell file for "' . a:lang . '" in ' . &enc
@@ -70,7 +61,7 @@ function! spellfile#LoadFile(lang)
    " Remember the buffer number, we check it below.
    new
    let newbufnr = winbufnr(0)
-    setlocal bin fenc=
+    setlocal bin
    echo 'Downloading ' . fname . '...'
    call spellfile#Nread(fname)
    if getline(2) !~ 'VIMspell'
@@ -83,7 +74,7 @@ function! spellfile#LoadFile(lang)
 	  " Our buffer has vanished!?  Open a new window.
 	  echomsg "download buffer disappeared, opening a new one"
 	  new
-	  setlocal bin fenc=
+	  setlocal bin
 	else
 	  exe winnr . "wincmd w"
 	endif
@@ -115,13 +106,7 @@ function! spellfile#LoadFile(lang)
    endfor
    let dirchoice = confirm(msg, dirchoices) - 2
    if dirchoice >= 0
-      if exists('*fnameescape')
-	let dirname = fnameescape(dirlist[dirchoice])
-      else
-	let dirname = escape(dirlist[dirchoice], ' ')
-      endif
-      setlocal fenc=
-      exe "write " . dirname . '/' . fname
+      exe "write " . escape(dirlist[dirchoice], ' ') . '/' . fname

      " Also download the .sug file, if the user wants to.
      let msg = "Do you want me to try getting the .sug file?\n"
@@ -134,7 +119,7 @@ function! spellfile#LoadFile(lang)
 	call spellfile#Nread(fname)
 	if getline(2) =~ 'VIMsug'
 	  1d
-	  exe "write " . dirname . '/' . fname
+	  exe "write " . escape(dirlist[dirchoice], ' ') . '/' . fname
 	  set nomod
 	else
 	  echo 'Sorry, downloading failed'
@@ -181,29 +166,3 @@ function! spellfile#Nread(fname)
    unlet g:netrw_use_errorwindow
  endif
 endfunc
-
-" Get a list of writable spell directories and choices for confirm().
-function! spellfile#GetDirChoices()
-  let dirlist = []
-  let dirchoices = '&Cancel'
-  for dir in split(globpath(&rtp, 'spell'), "\n")
-    if filewritable(dir) == 2
-      call add(dirlist, dir)
-      let dirchoices .= "\n&" . len(dirlist)
-    endif
-  endfor
-  return [dirlist, dirchoices]
-endfunc
-
-function! spellfile#WritableSpellDir()
-  if has("unix")
-    " For Unix always use the $HOME/.vim directory
-    return $HOME . "/.vim/spell"
-  endif
-  for dir in split(&rtp, ',')
-    if filewritable(dir) == 2
-      return dir . "/spell"
-    endif
-  endfor
-  return ''
-endfunction
@@ -1,97 +1,16 @@
 " Vim OMNI completion script for SQL
 " Language:    SQL
-" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Version:     15.0
-" Last Change: 2013 May 13
-" Homepage:    http://www.vim.org/scripts/script.php?script_id=1572
+" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+" Version:     5.0
+" Last Change: Mon Jun 05 2006 3:30:04 PM
 " Usage:       For detailed help
-"              ":help sql.txt"
-"              or ":help ft-sql-omni"
+"              ":help sql.txt" 
+"              or ":help ft-sql-omni" 
 "              or read $VIMRUNTIME/doc/sql.txt

-" History
-"
-" TODO
-"     - Jonas Enberg - if no table is found when using column completion
-"       look backwards to a FROM clause and find the first table
-"       and complete it.
-"
-" Version 15.0 (May 2013)
-"     - NF: Changed the SQL precached syntax items, omni_sql_precache_syntax_groups,
-"           to use regular expressions to pick up extended syntax group names.
-"           This requires an updated SyntaxComplete plugin version 13.0.
-"           If the required versions have not been installed, previous
-"           behaviour will not be impacted.
-"
-" Version 14.0 (Dec 2012)
-"     - BF: Added check for cpo
-"
-" Version 13.0 (Dec 2012)
-"     - NF: When completing column lists or drilling into a table
-"           and g:omni_sql_include_owner is enabled, the
-"           only the table name would be replaced with the column
-"           list instead of the table name and owner (if specified).
-"     - NF: When completing column lists using table aliases
-"           and g:omni_sql_include_owner is enabled, account
-"           for the owner name when looking up the table
-"           list instead of the table name and owner (if specified).
-"     - BF: When completing column lists or drilling into a table
-"           and g:omni_sql_include_owner is enabled, the
-"           column list could often not be found for the table.
-"     - BF: When OMNI popped up, possibly the wrong word
-"           would be replaced for column and column list options.
-"
-" Version 12.0 (Feb 2012)
-"     - Partial column name completion did not work when a table
-"       name or table alias was provided (Jonas Enberg).
-"     - Improved the handling of column completion.  First we match any
-"       columns from a previous completion.  If not matches are found, we
-"       consider the partial name to be a table or table alias for the
-"       query and attempt to match on it.
-"
-" Version 11.0 (Jan 2012)
-"     Added g:omni_sql_default_compl_type variable
-"         - You can specify which type of completion to default to
-"           when pressing <C-X><C-O>.  The entire list of available
-"           choices can be found in the calls to sqlcomplete#Map in:
-"               ftplugin/sql.vim
-"
-" Version 10.0
-"     Updated PreCacheSyntax()
-"         - Now returns a List of the syntax items it finds.
-"           This allows other plugins / scripts to use this list for their own
-"           purposes.  In this case XPTemplate can use them for a Choose list.
-"         - Verifies the parameters are the correct type and displays a
-"           warning if not.
-"         - Verifies the parameters are the correct type and displays a
-"           warning if not.
-"     Updated SQLCWarningMsg()
-"         - Prepends warning message with SQLComplete so you know who issued
-"           the warning.
-"     Updated SQLCErrorMsg()
-"         - Prepends error message with SQLComplete so you know who issued
-"           the error.
-"
-" Version 9.0 (May 2010)
-"     This change removes some of the support for tables with spaces in their
-"     names in order to simplify the regexes used to pull out query table
-"     aliases for more robust table name and column name code completion.
-"     Full support for "table names with spaces" can be added in again
-"     after 7.3.
-"
-" Version 8.0
-"     Incorrectly re-executed the g:ftplugin_sql_omni_key_right and g:ftplugin_sql_omni_key_left
-"     when drilling in and out of a column list for a table.
-"
-" Version 7.0 (Jan 2010)
-"     Better handling of object names
-"
-" Version 6.0 (Apr 2008)
-"     Supports object names with spaces "my table name"
-"
 " Set completion with CTRL-X CTRL-O to autoloaded function.
 " This check is in place in case this script is
-" sourced directly instead of using the autoload feature.
+" sourced directly instead of using the autoload feature. 
 if exists('&omnifunc')
    " Do not set the option if already set since this
    " results in an E117 warning.
@@ -101,11 +20,9 @@ if exists('&omnifunc')
 endif

 if exists('g:loaded_sql_completion')
-    finish
+    finish 
 endif
-let g:loaded_sql_completion = 150
-let s:keepcpo= &cpo
-set cpo&vim
+let g:loaded_sql_completion = 50

 " Maintains filename of dictionary
 let s:sql_file_table        = ""
@@ -118,19 +35,17 @@ let s:tbl_alias             = []
 let s:tbl_cols              = []
 let s:syn_list              = []
 let s:syn_value             = []
-
+ 
 " Used in conjunction with the syntaxcomplete plugin
 let s:save_inc              = ""
 let s:save_exc              = ""
-if !exists('g:omni_syntax_group_include_sql')
-    let g:omni_syntax_group_include_sql = ''
+if exists('g:omni_syntax_group_include_sql')
+    let s:save_inc = g:omni_syntax_group_include_sql
 endif
-if !exists('g:omni_syntax_group_exclude_sql')
-    let g:omni_syntax_group_exclude_sql = ''
+if exists('g:omni_syntax_group_exclude_sql')
+    let s:save_exc = g:omni_syntax_group_exclude_sql
 endif
-let s:save_inc = g:omni_syntax_group_include_sql
-let s:save_exc = g:omni_syntax_group_exclude_sql
-
+ 
 " Used with the column list
 let s:save_prev_table       = ""

@@ -141,12 +56,12 @@ endif
 " Default syntax items to precache
 if !exists('g:omni_sql_precache_syntax_groups')
    let g:omni_sql_precache_syntax_groups = [
-                \ 'syntax\w*',
-                \ 'sqlKeyword\w*',
-                \ 'sqlFunction\w*',
-                \ 'sqlOption\w*',
-                \ 'sqlType\w*',
-                \ 'sqlStatement\w*'
+                \ 'syntax',
+                \ 'sqlKeyword',
+                \ 'sqlFunction',
+                \ 'sqlOption',
+                \ 'sqlType',
+                \ 'sqlStatement'
                \ ]
 endif
 " Set ignorecase to the ftplugin standard
@@ -161,25 +76,14 @@ if !exists('g:omni_sql_include_owner')
        if g:loaded_dbext >= 300
            " New to dbext 3.00, by default the table lists include the owner
            " name of the table.  This is used when determining how much of
-            " whatever has been typed should be replaced as part of the
+            " whatever has been typed should be replaced as part of the 
            " code replacement.
            let g:omni_sql_include_owner = 1
        endif
    endif
 endif
-" Default type of completion used when <C-X><C-O> is pressed
-if !exists('g:omni_sql_default_compl_type')
-    let g:omni_sql_default_compl_type = 'table'
-endif

 " This function is used for the 'omnifunc' option.
-" It is called twice by omni and it is responsible
-" for returning the completion list of items.
-" But it must also determine context of what to complete
-" and what to "replace" with the completion.
-" The a:base, is replaced directly with what the user
-" chooses from the choices.
-" The s:prepend provides context for the completion.
 function! sqlcomplete#Complete(findstart, base)

    " Default to table name completion
@@ -188,7 +92,6 @@ function! sqlcomplete#Complete(findstart, base)
    if exists('b:sql_compl_type')
        let compl_type = b:sql_compl_type
    endif
-    let begindot = 0

    " First pass through this function determines how much of the line should
    " be replaced by whatever is chosen from the completion list
@@ -197,35 +100,20 @@ function! sqlcomplete#Complete(findstart, base)
        let line     = getline('.')
        let start    = col('.') - 1
        let lastword = -1
+        let begindot = 0
        " Check if the first character is a ".", for column completion
        if line[start - 1] == '.'
            let begindot = 1
        endif
        while start > 0
-            " Additional code was required to handle objects which
-            " can contain spaces like "my table name".
-            if line[start - 1] !~ '\(\w\|\.\)'
-                " If the previous character is not a period or word character
-                break
-            " elseif line[start - 1] =~ '\(\w\|\s\+\)'
-            "     let start -= 1
-            elseif line[start - 1] =~ '\w'
-                " If the previous character is word character continue back
+            if line[start - 1] =~ '\w'
                let start -= 1
-            elseif line[start - 1] =~ '\.' &&
+            elseif line[start - 1] =~ '\.' && 
                        \ compl_type =~ 'column\|table\|view\|procedure'
-                " If the previous character is a period and we are completing
-                " an object which can be specified with a period like this:
-                "     table_name.column_name
-                "     owner_name.table_name
-
                " If lastword has already been set for column completion
                " break from the loop, since we do not also want to pickup
                " a table name if it was also supplied.
-                " Unless g:omni_sql_include_owner == 1, then we can
-                " include the ownername.
-                if lastword != -1 && compl_type == 'column'
-                            \ && g:omni_sql_include_owner == 0
+                if lastword != -1 && compl_type == 'column' 
                    break
                endif
                " If column completion was specified stop at the "." if
@@ -236,8 +124,8 @@ function! sqlcomplete#Complete(findstart, base)
                endif
                " If omni_sql_include_owner = 0, do not include the table
                " name as part of the substitution, so break here
-                if lastword == -1 &&
-                            \ compl_type =~ '\<\(table\|view\|procedure\|column\|column_csv\)\>' &&
+                if lastword == -1 && 
+                            \ compl_type =~ 'table\|view\|procedure\column_csv' && 
                            \ g:omni_sql_include_owner == 0
                    let lastword = start
                    break
@@ -267,7 +155,7 @@ function! sqlcomplete#Complete(findstart, base)
    let compl_list = []

    " Default to table name completion
-    let compl_type = g:omni_sql_default_compl_type
+    let compl_type = 'table'
    " Allow maps to specify what type of object completion they want
    if exists('b:sql_compl_type')
        let compl_type = b:sql_compl_type
@@ -281,7 +169,7 @@ function! sqlcomplete#Complete(findstart, base)

    if compl_type == 'table' ||
                \ compl_type == 'procedure' ||
-                \ compl_type == 'view'
+                \ compl_type == 'view' 

        " This type of completion relies upon the dbext.vim plugin
        if s:SQLCCheck4dbext() == -1
@@ -290,26 +178,32 @@ function! sqlcomplete#Complete(findstart, base)

        " Allow the user to override the dbext plugin to specify whether
        " the owner/creator should be included in the list
-        if g:loaded_dbext >= 300
-            let saveSetting = DB_listOption('dict_show_owner')
-            exec 'DBSetOption dict_show_owner='.(g:omni_sql_include_owner==1?'1':'0')
+        let saved_dbext_show_owner      = 1
+        if exists('g:dbext_default_dict_show_owner')
+            let saved_dbext_show_owner  = g:dbext_default_dict_show_owner
        endif
+        let g:dbext_default_dict_show_owner = g:omni_sql_include_owner

        let compl_type_uc = substitute(compl_type, '\w\+', '\u&', '')
-        " Same call below, no need to do it twice
-        " if s:sql_file_{compl_type} == ""
-        "     let s:sql_file_{compl_type} = DB_getDictionaryName(compl_type_uc)
-        " endif
+        if s:sql_file_{compl_type} == ""
+            let s:sql_file_{compl_type} = DB_getDictionaryName(compl_type_uc)
+        endif
        let s:sql_file_{compl_type} = DB_getDictionaryName(compl_type_uc)
        if s:sql_file_{compl_type} != ""
            if filereadable(s:sql_file_{compl_type})
                let compl_list = readfile(s:sql_file_{compl_type})
+                " let dic_list = readfile(s:sql_file_{compl_type})
+                " if !empty(dic_list)
+                "     for elem in dic_list
+                "         let kind = (compl_type=='table'?'m':(compl_type=='procedure'?'f':'v'))
+                "         let item = {'word':elem, 'menu':elem, 'kind':kind, 'info':compl_type}
+                "         let compl_list += [item]
+                "     endfor
+                " endif
            endif
        endif

-        if g:loaded_dbext > 300
-            exec 'DBSetOption dict_show_owner='.saveSetting
-        endif
+        let g:dbext_default_dict_show_owner = saved_dbext_show_owner
    elseif compl_type =~? 'column'

        " This type of completion relies upon the dbext.vim plugin
@@ -319,7 +213,7 @@ function! sqlcomplete#Complete(findstart, base)

        if base == ""
            " The last time we displayed a column list we stored
-            " the table name.  If the user selects a column list
+            " the table name.  If the user selects a column list 
            " without a table name of alias present, assume they want
            " the previous column list displayed.
            let base = s:save_prev_table
@@ -334,26 +228,20 @@ function! sqlcomplete#Complete(findstart, base)
            let table  = matchstr( base, '^\(.*\.\)\?\zs.*\ze\..*' )
            let column = matchstr( base, '.*\.\zs.*' )

-            if g:omni_sql_include_owner == 1 && owner == '' && table != '' && column != ''
-                let owner  = table
-                let table  = column
-                let column = ''
-            endif
-
            " It is pretty well impossible to determine if the user
            " has entered:
            "    owner.table
            "    table.column_prefix
-            " So there are a couple of things we can do to mitigate
+            " So there are a couple of things we can do to mitigate 
            " this issue.
            "    1.  Check if the dbext plugin has the option turned
            "        on to even allow owners
            "    2.  Based on 1, if the user is showing a table list
-            "        and the DrillIntoTable (using <Right>) then
+            "        and the DrillIntoTable (using <C-Right>) then 
            "        this will be owner.table.  In this case, we can
-            "        check to see the table.column exists in the
+            "        check to see the table.column exists in the 
            "        cached table list.  If it does, then we have
-            "        determined the user has actually chosen
+            "        determined the user has actually chosen 
            "        owner.table, not table.column_prefix.
            let found = -1
            if g:omni_sql_include_owner == 1 && owner == ''
@@ -368,46 +256,17 @@ function! sqlcomplete#Complete(findstart, base)
            " If the user has indicated not to use table owners at all and
            " the base ends in a '.' we know they are not providing a column
            " name, so we can shift the items appropriately.
-            " if found != -1 || (g:omni_sql_include_owner == 0 && base !~ '\.$')
-            "     let owner  = table
-            "     let table  = column
-            "     let column = ''
-            " endif
-        else
-            " If no "." was provided and the user asked for
-            " column level completion, first attempt the match
-            " on any previous column lists.  If the user asked
-            " for a list of columns comma separated, continue as usual.
-            if compl_type == 'column' && s:save_prev_table != ''
-                " The last time we displayed a column list we stored
-                " the table name.  If the user selects a column list
-                " without a table name of alias present, assume they want
-                " the previous column list displayed.
-                let table     = s:save_prev_table
-                let list_type = ''
-
-                let compl_list  = s:SQLCGetColumns(table, list_type)
-                if ! empty(compl_list)
-                    " If no column prefix has been provided and the table
-                    " name was provided, append it to each of the items
-                    " returned.
-                    let compl_list = filter(deepcopy(compl_list), 'v:val=~"^'.base.'"' )
-
-                    " If not empty, we have a match on columns
-                    " return the list
-                    if ! empty(compl_list)
-                        return compl_list
-                    endif
-                endif
+            if found != -1 || (g:omni_sql_include_owner == 0 && base !~ '\.$')
+                let owner  = table
+                let table  = column
+                let column = ''
            endif
-            " Since no columns were found to match the base supplied
-            " assume the user is trying to complete the column list
-            " for a table (and or an alias to a table).
+        else
            let table  = base
        endif

        " Get anything after the . and consider this the table name
-        " If an owner has been specified, then we must consider the
+        " If an owner has been specified, then we must consider the 
        " base to be a partial column name
        " let base  = matchstr( base, '^\(.*\.\)\?\zs.*' )

@@ -422,25 +281,16 @@ function! sqlcomplete#Complete(findstart, base)
                let list_type     = 'csv'
            endif

-            " If we are including the OWNER for the objects, then for
-            " table completion, if we have it, it should be included
-            " as there can be the same table names in a database yet
-            " with different owner names.
-            if g:omni_sql_include_owner == 1 && owner != '' && table != ''
-                let compl_list  = s:SQLCGetColumns(owner.'.'.table, list_type)
-            else
-                let compl_list  = s:SQLCGetColumns(table, list_type)
-            endif
-
+            let compl_list  = s:SQLCGetColumns(table, list_type)
            if column != ''
                " If no column prefix has been provided and the table
                " name was provided, append it to each of the items
                " returned.
-                let compl_list = map(compl_list, 'table.".".v:val')
+                let compl_list = map(compl_list, "table.'.'.v:val")
                if owner != ''
                    " If an owner has been provided append it to each of the
                    " items returned.
-                    let compl_list = map(compl_list, 'owner.".".v:val')
+                    let compl_list = map(compl_list, "owner.'.'.v:val")
                endif
            else
                let base = ''
@@ -454,14 +304,11 @@ function! sqlcomplete#Complete(findstart, base)
        endif
    elseif compl_type == 'resetCache'
        " Reset all cached items
-        let s:tbl_name           = []
-        let s:tbl_alias          = []
-        let s:tbl_cols           = []
-        let s:syn_list           = []
-        let s:syn_value          = []
-        let s:sql_file_table     = ""
-        let s:sql_file_procedure = ""
-        let s:sql_file_view      = ""
+        let s:tbl_name  = []
+        let s:tbl_alias = []
+        let s:tbl_cols  = []
+        let s:syn_list  = []
+        let s:syn_value = []

        let msg = "All SQL cached items have been removed."
        call s:SQLCWarningMsg(msg)
@@ -472,54 +319,22 @@ function! sqlcomplete#Complete(findstart, base)
    endif

    if base != ''
-        " Filter the list based on the first few characters the user entered.
-        " Check if the text matches at the beginning
-        "         \\(^.base.'\\)
-        " or
-        " Match to a owner.table or alias.column type match
-        "         ^\\(\\w\\+\\.\\)\\?'.base.'\\)
-        " or
-        " Handle names with spaces "my table name"
-        "         "\\(^'.base.'\\|^\\(\\w\\+\\.\\)\\?'.base.'\\)"'
-        "
-        let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\|^\\(\\w\\+\\.\\)\\?'.base.'\\)"'
-        " let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\)"'
-        " let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\|\\(\\.\\)\\?'.base.'\\)"'
-        " let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\|\\([^.]*\\)\\?'.base.'\\)"'
+        " Filter the list based on the first few characters the user
+        " entered
+        let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\|\\([^.]*\\)\\?'.base.'\\)"'
        let compl_list = filter(deepcopy(compl_list), expr)
-
-        if empty(compl_list) && compl_type == 'table' && base =~ '\.$'
-            " It is possible we could be looking for column name completion
-            " and the user simply hit C-X C-O to lets try it as well
-            " since we had no hits with the tables.
-            " If the base ends with a . it is hard to know if we are
-            " completing table names or column names.
-            let list_type = ''
-
-            let compl_list  = s:SQLCGetColumns(base, list_type)
-        endif
    endif

    if exists('b:sql_compl_savefunc') && b:sql_compl_savefunc != ""
        let &omnifunc = b:sql_compl_savefunc
    endif

-    if empty(compl_list)
-        call s:SQLCWarningMsg( 'Could not find type['.compl_type.'] using prepend[.'.s:prepended.'] base['.a:base.']' )
-    endif
-
    return compl_list
 endfunc

 function! sqlcomplete#PreCacheSyntax(...)
    let syn_group_arr = []
-    let syn_items     = []
-
-    if a:0 > 0
-        if type(a:1) != 3
-            call s:SQLCWarningMsg("Parameter is not a list. Example:['syntaxGroup1', 'syntaxGroup2']")
-            return ''
-        endif
+    if a:0 > 0 
        let syn_group_arr = a:1
    else
        let syn_group_arr = g:omni_sql_precache_syntax_groups
@@ -528,36 +343,7 @@ function! sqlcomplete#PreCacheSyntax(...)
    " the sytnax items.
    if !empty(syn_group_arr)
        for group_name in syn_group_arr
-            let syn_items = extend( syn_items, s:SQLCGetSyntaxList(group_name) )
-        endfor
-    endif
-
-    return syn_items
-endfunction
-
-function! sqlcomplete#ResetCacheSyntax(...)
-    let syn_group_arr = []
-
-    if a:0 > 0
-        if type(a:1) != 3
-            call s:SQLCWarningMsg("Parameter is not a list. Example:['syntaxGroup1', 'syntaxGroup2']")
-            return ''
-        endif
-        let syn_group_arr = a:1
-    else
-        let syn_group_arr = g:omni_sql_precache_syntax_groups
-    endif
-    " For each group specified in the list, precache all
-    " the sytnax items.
-    if !empty(syn_group_arr)
-        for group_name in syn_group_arr
-            let list_idx = index(s:syn_list, group_name, 0, &ignorecase)
-            if list_idx > -1
-                " Remove from list of groups
-                call remove( s:syn_list, list_idx )
-                " Remove from list of keywords
-                call remove( s:syn_value, list_idx )
-            endif
+            call s:SQLCGetSyntaxList(group_name)
        endfor
    endif
 endfunction
@@ -584,14 +370,13 @@ function! sqlcomplete#DrillIntoTable()
        call sqlcomplete#Map('column')
        " C-Y, makes the currently highlighted entry active
        " and trigger the omni popup to be redisplayed
-        call feedkeys("\<C-Y>\<C-X>\<C-O>", 'n')
+        call feedkeys("\<C-Y>\<C-X>\<C-O>")
    else
-	" If the popup is not visible, simple perform the normal
-	" key behaviour.
-	" Must use exec since they key must be preceeded by "\"
-	" or feedkeys will simply push each character of the string
-	" rather than the "key press".
-        exec 'call feedkeys("\'.g:ftplugin_sql_omni_key_right.'", "n")'
+        if has('win32')
+            " If the popup is not visible, simple perform the normal
+            " <C-Right> behaviour
+            exec "normal! \<C-Right>"
+        endif
    endif
    return ""
 endfunction
@@ -603,28 +388,27 @@ function! sqlcomplete#DrillOutOfColumns()
        " Trigger the omni popup to be redisplayed
        call feedkeys("\<C-X>\<C-O>")
    else
-	" If the popup is not visible, simple perform the normal
-	" key behaviour.
-	" Must use exec since they key must be preceeded by "\"
-	" or feedkeys will simply push each character of the string
-	" rather than the "key press".
-        exec 'call feedkeys("\'.g:ftplugin_sql_omni_key_left.'", "n")'
+        if has('win32')
+            " If the popup is not visible, simple perform the normal
+            " <C-Left> behaviour
+            exec "normal! \<C-Left>"
+        endif
    endif
    return ""
 endfunction

 function! s:SQLCWarningMsg(msg)
    echohl WarningMsg
-    echomsg 'SQLComplete:'.a:msg
+    echomsg a:msg 
    echohl None
 endfunction
-
+      
 function! s:SQLCErrorMsg(msg)
    echohl ErrorMsg
-    echomsg 'SQLComplete:'.a:msg
+    echomsg a:msg 
    echohl None
 endfunction
-
+      
 function! s:SQLCGetSyntaxList(syn_group)
    let syn_group  = a:syn_group
    let compl_list = []
@@ -635,23 +419,19 @@ function! s:SQLCGetSyntaxList(syn_group)
        " Return previously cached value
        let compl_list = s:syn_value[list_idx]
    else
-        let s:save_inc = g:omni_syntax_group_include_sql
-        let s:save_exc = g:omni_syntax_group_exclude_sql
-        let g:omni_syntax_group_include_sql = ''
-        let g:omni_syntax_group_exclude_sql = ''
-
-        " Request the syntax list items from the
+        " Request the syntax list items from the 
        " syntax completion plugin
        if syn_group == 'syntax'
            " Handle this special case.  This allows the user
            " to indicate they want all the syntax items available,
            " so do not specify a specific include list.
-            let syn_value                       = syntaxcomplete#OmniSyntaxList()
+            let g:omni_syntax_group_include_sql = ''
        else
            " The user has specified a specific syntax group
            let g:omni_syntax_group_include_sql = syn_group
-            let syn_value                       = syntaxcomplete#OmniSyntaxList(syn_group)
        endif
+        let g:omni_syntax_group_exclude_sql = ''
+        let syn_value                       = OmniSyntaxList()
        let g:omni_syntax_group_include_sql = s:save_inc
        let g:omni_syntax_group_exclude_sql = s:save_exc
        " Cache these values for later use
@@ -670,8 +450,8 @@ function! s:SQLCCheck4dbext()
        " Leave time for the user to read the error message
        :sleep 2
        return -1
-    elseif g:loaded_dbext < 600
-        let msg = "The dbext plugin must be at least version 5.30 " .
+    elseif g:loaded_dbext < 300
+        let msg = "The dbext plugin must be at least version 3.00 " .
                    \ " for dynamic SQL completion"
        call s:SQLCErrorMsg(msg)
        " Leave time for the user to read the error message
@@ -687,7 +467,7 @@ function! s:SQLCAddAlias(table_name, table_alias, cols)
    let table_alias = a:table_alias
    let cols        = a:cols

-    if g:omni_sql_use_tbl_alias != 'n'
+    if g:omni_sql_use_tbl_alias != 'n' 
        if table_alias == ''
            if 'da' =~? g:omni_sql_use_tbl_alias
                if table_name =~ '_'
@@ -697,13 +477,13 @@ function! s:SQLCAddAlias(table_name, table_alias, cols)
                    setlocal iskeyword-=_

                    " Get the first letter of each word
-                    " [[:alpha:]] is used instead of \w
+                    " [[:alpha:]] is used instead of \w 
                    " to catch extended accented characters
                    "
-                    let table_alias = substitute(
-                                \ table_name,
-                                \ '\<[[:alpha:]]\+\>_\?',
-                                \ '\=strpart(submatch(0), 0, 1)',
+                    let table_alias = substitute( 
+                                \ table_name, 
+                                \ '\<[[:alpha:]]\+\>_\?', 
+                                \ '\=strpart(submatch(0), 0, 1)', 
                                \ 'g'
                                \ )
                    " Restore original value
@@ -731,75 +511,49 @@ function! s:SQLCAddAlias(table_name, table_alias, cols)
    return cols
 endfunction

-function! s:SQLCGetObjectOwner(object)
+function! s:SQLCGetObjectOwner(object) 
    " The owner regex matches a word at the start of the string which is
    " followed by a dot, but doesn't include the dot in the result.
-    " ^           - from beginning of line
-    " \("\|\[\)\? - ignore any quotes
-    " \zs         - start the match now
-    " .\{-}       - get owner name
-    " \ze         - end the match
-    " \("\|\[\)\? - ignore any quotes
-    " \.          - must by followed by a .
-    " let owner = matchstr( a:object, '^\s*\zs.*\ze\.' )
-    let owner = matchstr( a:object, '^\("\|\[\)\?\zs\.\{-}\ze\("\|\]\)\?\.' )
+    " ^    - from beginning of line
+    " "\?  - ignore any quotes
+    " \zs  - start the match now
+    " \w\+ - get owner name
+    " \ze  - end the match
+    " "\?  - ignore any quotes
+    " \.   - must by followed by a .
+    let owner = matchstr( a:object, '^"\?\zs\w\+\ze"\?\.' )
    return owner
-endfunction
+endfunction 

 function! s:SQLCGetColumns(table_name, list_type)
-    if a:table_name =~ '\.'
-        " Check if the owner/creator has been specified
-        let owner  = matchstr( a:table_name, '^\zs.*\ze\..*\..*' )
-        let table  = matchstr( a:table_name, '^\(.*\.\)\?\zs.*\ze\..*' )
-        let column = matchstr( a:table_name, '.*\.\zs.*' )
-
-        if g:omni_sql_include_owner == 1 && owner == '' && table != '' && column != ''
-            let owner  = table
-            let table  = column
-            let column = ''
-        endif
-    else
-        let owner  = ''
-        let table  = matchstr(a:table_name, '^["\[\]a-zA-Z0-9_ ]\+\ze\.\?')
-        let column = ''
-    endif
-
    " Check if the table name was provided as part of the column name
-    " let table_name   = matchstr(a:table_name, '^["\[\]a-zA-Z0-9_ ]\+\ze\.\?')
-    let table_name   = table
+    let table_name   = matchstr(a:table_name, '^[a-zA-Z0-9_]\+\ze\.\?')
    let table_cols   = []
    let table_alias  = ''
    let move_to_top  = 1

-    let table_name   = substitute(table_name, '\s*\(.\{-}\)\s*$', '\1', 'g')
-
-    " If the table name was given as:
-    "     where c.
-    let table_name   = substitute(table_name, '^\c\(WHERE\|AND\|OR\)\s\+', '', '')
    if g:loaded_dbext >= 300
        let saveSettingAlias = DB_listOption('use_tbl_alias')
        exec 'DBSetOption use_tbl_alias=n'
    endif

-    let table_name_stripped = substitute(table_name, '["\[\]]*', '', 'g')
-
    " Check if we have already cached the column list for this table
    " by its name
-    let list_idx = index(s:tbl_name, table_name_stripped, 0, &ignorecase)
+    let list_idx = index(s:tbl_name, table_name, 0, &ignorecase)
    if list_idx > -1
-        let table_cols = split(s:tbl_cols[list_idx], '\n')
+        let table_cols = split(s:tbl_cols[list_idx])
    else
-        " Check if we have already cached the column list for this table
+        " Check if we have already cached the column list for this table 
        " by its alias, assuming the table_name provided was actually
        " the alias for the table instead
        "     select *
        "       from area a
        "      where a.
-        let list_idx = index(s:tbl_alias, table_name_stripped, 0, &ignorecase)
+        let list_idx = index(s:tbl_alias, table_name, 0, &ignorecase)
        if list_idx > -1
-            let table_alias = table_name_stripped
+            let table_alias = table_name
            let table_name  = s:tbl_name[list_idx]
-            let table_cols  = split(s:tbl_cols[list_idx], '\n')
+            let table_cols  = split(s:tbl_cols[list_idx])
        endif
    endif

@@ -807,7 +561,7 @@ function! s:SQLCGetColumns(table_name, list_type)
    " And the table ends in a "." or we are looking for a column list
    " if list_idx == -1 && (a:table_name =~ '\.' || b:sql_compl_type =~ 'column')
    " if list_idx == -1 && (a:table_name =~ '\.' || a:list_type =~ 'csv')
-    if list_idx == -1
+    if list_idx == -1 
         let saveY      = @y
         let saveSearch = @/
         let saveWScan  = &wrapscan
@@ -818,7 +572,7 @@ function! s:SQLCGetColumns(table_name, list_type)
         setlocal nowrapscan
         " If . was entered, look at the word just before the .
         " We are looking for something like this:
-         "    select *
+         "    select * 
         "      from customer c
         "     where c.
         " So when . is pressed, we need to find 'c'
@@ -827,7 +581,7 @@ function! s:SQLCGetColumns(table_name, list_type)
         " Search backwards to the beginning of the statement
         " and do NOT wrap
         " exec 'silent! normal! v?\<\(select\|update\|delete\|;\)\>'."\n".'"yy'
-         exec 'silent! normal! ?\<\c\(select\|update\|delete\|;\)\>'."\n"
+         exec 'silent! normal! ?\<\(select\|update\|delete\|;\)\>'."\n"

         " Start characterwise visual mode
         " Advance right one character
@@ -836,47 +590,27 @@ function! s:SQLCGetColumns(table_name, list_type)
         "     2.  A ; at the end of a line (the delimiter)
         "     3.  The end of the file (incase no delimiter)
         " Yank the visually selected text into the "y register.
-         exec 'silent! normal! vl/\c\(\<select\>\|\<update\>\|\<delete\>\|;\s*$\|\%$\)'."\n".'"yy'
+         exec 'silent! normal! vl/\(\<select\>\|\<update\>\|\<delete\>\|;\s*$\|\%$\)'."\n".'"yy'

         let query = @y
         let query = substitute(query, "\n", ' ', 'g')
         let found = 0

-         " if query =~? '^\c\(select\)'
-         if query =~? '^\(select\|update\|delete\)'
+         " if query =~? '^\(select\|update\|delete\)'
+         if query =~? '^\(select\)'
             let found = 1
-             "  \(\(\<\w\+\>\)\.\)\?   -
-             " '\c\(from\|join\|,\).\{-}'  - Starting at the from clause (case insensitive)
+             "  \(\(\<\w\+\>\)\.\)\?   - 
+             " 'from.\{-}'  - Starting at the from clause
             " '\zs\(\(\<\w\+\>\)\.\)\?' - Get the owner name (optional)
-             " '\<\w\+\>\ze' - Get the table name
+             " '\<\w\+\>\ze' - Get the table name 
             " '\s\+\<'.table_name.'\>' - Followed by the alias
             " '\s*\.\@!.*'  - Cannot be followed by a .
             " '\(\<where\>\|$\)' - Must be followed by a WHERE clause
             " '.*'  - Exclude the rest of the line in the match
-             " let table_name_new = matchstr(@y,
-             "             \ '\c\(from\|join\|,\).\{-}'.
-             "             \ '\zs\(\("\|\[\)\?.\{-}\("\|\]\)\.\)\?'.
-             "             \ '\("\|\[\)\?.\{-}\("\|\]\)\?\ze'.
-             "             \ '\s\+\%(as\s\+\)\?\<'.
-             "             \ matchstr(table_name, '.\{-}\ze\.\?$').
-             "             \ '\>'.
-             "             \ '\s*\.\@!.*'.
-             "             \ '\(\<where\>\|$\)'.
-             "             \ '.*'
-             "             \ )
-             "
-             "
-             " ''\c\(\<from\>\|\<join\>\|,\)\s*'  - Starting at the from clause (case insensitive)
-             " '\zs\(\("\|\[\)\?\w\+\("\|\]\)\?\.\)\?' - Get the owner name (optional)
-             " '\("\|\[\)\?\w\+\("\|\]\)\?\ze' - Get the table name
-             " '\s\+\%(as\s\+\)\?\<'.matchstr(table_name, '.\{-}\ze\.\?$').'\>' - Followed by the alias
-             " '\s*\.\@!.*'  - Cannot be followed by a .
-             " '\(\<where\>\|$\)' - Must be followed by a WHERE clause
-             " '.*'  - Exclude the rest of the line in the match
-             let table_name_new = matchstr(@y,
-                         \ '\c\(\<from\>\|\<join\>\|,\)\s*'.
-                         \ '\zs\(\("\|\[\)\?\w\+\("\|\]\)\?\.\)\?'.
-                         \ '\("\|\[\)\?\w\+\("\|\]\)\?\ze'.
+             let table_name_new = matchstr(@y, 
+                         \ 'from.\{-}'.
+                         \ '\zs\(\(\<\w\+\>\)\.\)\?'.
+                         \ '\<\w\+\>\ze'.
                         \ '\s\+\%(as\s\+\)\?\<'.
                         \ matchstr(table_name, '.\{-}\ze\.\?$').
                         \ '\>'.
@@ -884,15 +618,9 @@ function! s:SQLCGetColumns(table_name, list_type)
                         \ '\(\<where\>\|$\)'.
                         \ '.*'
                         \ )
-
             if table_name_new != ''
                 let table_alias = table_name
-                 if g:omni_sql_include_owner == 1
-                    let table_name  = matchstr( table_name_new, '^\zs\(.\{-}\.\)\?\(.\{-}\.\)\?.*\ze' )
-                 else
-                     " let table_name  = matchstr( table_name_new, '^\(.*\.\)\?\zs.*\ze' )
-                    let table_name  = matchstr( table_name_new, '^\(.\{-}\.\)\?\zs\(.\{-}\.\)\?.*\ze' )
-                 endif
+                 let table_name  = table_name_new

                 let list_idx = index(s:tbl_name, table_name, 0, &ignorecase)
                 if list_idx > -1
@@ -920,7 +648,7 @@ function! s:SQLCGetColumns(table_name, list_type)

         " Return to previous location
         call cursor(curline, curcol)
-
+         
         if found == 0
             if g:loaded_dbext > 300
                 exec 'DBSetOption use_tbl_alias='.saveSettingAlias
@@ -929,19 +657,18 @@ function! s:SQLCGetColumns(table_name, list_type)
             " Not a SQL statement, do not display a list
             return []
         endif
-    endif
+    endif 

    if empty(table_cols)
        " Specify silent mode, no messages to the user (tbl, 1)
        " Specify do not comma separate (tbl, 1, 1)
-        " let table_cols_str = DB_getListColumn(table_name, 1, 1)
-        let table_cols_str = DB_getListColumn((owner!=''?owner.'.':'').table_name, 1, 1)
+        let table_cols_str = DB_getListColumn(table_name, 1, 1)

        if table_cols_str != ""
            let s:tbl_name  = add( s:tbl_name,  table_name )
            let s:tbl_alias = add( s:tbl_alias, table_alias )
            let s:tbl_cols  = add( s:tbl_cols,  table_cols_str )
-            let table_cols  = split(table_cols_str, '\n')
+            let table_cols  = split(table_cols_str)
        endif

    endif
@@ -961,7 +688,4 @@ function! s:SQLCGetColumns(table_name, list_type)

    return table_cols
 endfunction
-"  Restore:
-let &cpo= s:keepcpo
-unlet s:keepcpo
-" vim: ts=4 fdm=marker
+
@@ -1,80 +1,13 @@
 " Vim completion script
 " Language:    All languages, uses existing syntax highlighting rules
-" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Version:     13.0
-" Last Change: 2013 May 14
-" Usage:       For detailed help, ":help ft-syntax-omni"
+" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+" Version:     3.0
+" Last Change: Wed Nov 08 2006 10:46:46 AM
+" Usage:       For detailed help, ":help ft-syntax-omni" 

-" History
-"
-" Version 13.0
-"   - Extended the option omni_syntax_group_include_{filetype}
-"     to accept a comma separated list of regex's rather than
-"     string.  For example, for the javascript filetype you could
-"     use:
-"        let g:omni_syntax_group_include_javascript = 'javascript\w\+,jquery\w\+'
-"   - Some syntax files (perl.vim) use the match // syntax as a mechanism
-"     to identify keywords.  This update attempts to parse the
-"     match syntax and pull out syntax items which are at least
-"     3 words or more.
-"
-" Version 12.0
-"   - It is possible to have '-' as part of iskeyword, when
-"     checking for character ranges, tighten up the regex.
-"     E688: More targets than List items.
-"
-" Version 11.0
-"   - Corrected which characters required escaping during
-"     substitution calls.
-"
-" Version 10.0
-"   - Cycle through all the character ranges specified in the
-"     iskeyword option and build a list of valid word separators.
-"     Prior to this change, only actual characters were used,
-"     where for example ASCII "45" == "-".  If "45" were used
-"     in iskeyword the hyphen would not be picked up.
-"     This introduces a new option, since the character ranges
-"     specified could be multibyte:
-"         let g:omni_syntax_use_single_byte = 1
-"   - This by default will only allow single byte ASCII
-"     characters to be added and an additional check to ensure
-"     the charater is printable (see documentation for isprint).
-"
-" Version 9.0
-"   - Add the check for cpo.
-"
-" Version 8.0
-"   - Updated SyntaxCSyntaxGroupItems()
-"         - Some additional syntax items were also allowed
-"           on nextgroup= lines which were ignored by default.
-"           Now these lines are processed independently.
-"
-" Version 7.0
-"   - Updated syntaxcomplete#OmniSyntaxList()
-"         - Looking up the syntax groups defined from a syntax file
-"           looked for only 1 format of {filetype}GroupName, but some
-"           syntax writers use this format as well:
-"               {b:current_syntax}GroupName
-"   -       OmniSyntaxList() will now check for both if the first
-"           method does not find a match.
-"
-" Version 6.0
-"   - Added syntaxcomplete#OmniSyntaxList()
-"         - Allows other plugins to use this for their own
-"           purposes.
-"         - It will return a List of all syntax items for the
-"           syntax group name passed in.
-"         - XPTemplate for SQL will use this function via the
-"           sqlcomplete plugin to populate a Choose box.
-"
-" Version 5.0
-"   - Updated SyntaxCSyntaxGroupItems()
-"         - When processing a list of syntax groups, the final group
-"           was missed in function SyntaxCSyntaxGroupItems.
-"
 " Set completion with CTRL-X CTRL-O to autoloaded function.
 " This check is in place in case this script is
-" sourced directly instead of using the autoload feature.
+" sourced directly instead of using the autoload feature. 
 if exists('+omnifunc')
    " Do not set the option if already set since this
    " results in an E117 warning.
@@ -84,13 +17,9 @@ if exists('+omnifunc')
 endif

 if exists('g:loaded_syntax_completion')
-    finish
+    finish 
 endif
-let g:loaded_syntax_completion = 130
-
-" Turn on support for line continuations when creating the script
-let s:cpo_save = &cpo
-set cpo&vim
+let g:loaded_syntax_completion = 30

 " Set ignorecase to the ftplugin standard
 " This is the default setting, but if you define a buffer local
@@ -107,18 +36,6 @@ if !exists('g:omni_syntax_use_iskeyword')
    let g:omni_syntax_use_iskeyword = 1
 endif

-" When using iskeyword, this setting controls whether the characters
-" should be limited to single byte characters.
-if !exists('g:omni_syntax_use_single_byte')
-    let g:omni_syntax_use_single_byte = 1
-endif
-
-" When using iskeyword, this setting controls whether the characters
-" should be limited to single byte characters.
-if !exists('g:omni_syntax_use_iskeyword_numeric')
-    let g:omni_syntax_use_iskeyword_numeric = 1
-endif
-
 " Only display items in the completion window that are at least
 " this many characters in length.
 " This is the default setting, but if you define a buffer local
@@ -129,10 +46,8 @@ endif

 " This script will build a completion list based on the syntax
 " elements defined by the files in $VIMRUNTIME/syntax.
-" let s:syn_remove_words = 'match,matchgroup=,contains,'.
-let s:syn_remove_words = 'matchgroup=,contains,'.
-            \ 'links to,start=,end='
-            " \ 'links to,start=,end=,nextgroup='
+let s:syn_remove_words = 'match,matchgroup=,contains,'.
+            \ 'links to,start=,end=,nextgroup='

 let s:cache_name = []
 let s:cache_list = []
@@ -208,30 +123,7 @@ function! syntaxcomplete#Complete(findstart, base)
    return compl_list
 endfunc

-function! syntaxcomplete#OmniSyntaxList(...)
-    if a:0 > 0
-        let parms = []
-        if 3 == type(a:1)
-            let parms = a:1
-        elseif 1 == type(a:1)
-            let parms = split(a:1, ',')
-        endif
-        return OmniSyntaxList( parms )
-    else
-        return OmniSyntaxList()
-    endif
-endfunc
-
-function! OmniSyntaxList(...)
-    let list_parms = []
-    if a:0 > 0
-        if 3 == type(a:1)
-            let list_parms = a:1
-        elseif 1 == type(a:1)
-            let list_parms = split(a:1, ',')
-        endif
-    endif
-
+function! OmniSyntaxList()
    " Default to returning a dictionary, if use_dictionary is set to 0
    " a list will be returned.
    " let use_dictionary = 1
@@ -260,56 +152,22 @@ function! OmniSyntaxList(...)
    endif

    let saveL = @l
-    let filetype = substitute(&filetype, '\.', '_', 'g')
-
-    if empty(list_parms)
-        " Default the include group to include the requested syntax group
-        let syntax_group_include_{filetype} = ''
-        " Check if there are any overrides specified for this filetype
-        if exists('g:omni_syntax_group_include_'.filetype)
-            let syntax_group_include_{filetype} =
-                        \ substitute( g:omni_syntax_group_include_{filetype},'\s\+','','g')
-            let list_parms = split(g:omni_syntax_group_include_{filetype}, ',')
-            if syntax_group_include_{filetype} =~ '\w'
-                let syntax_group_include_{filetype} =
-                            \ substitute( syntax_group_include_{filetype},
-                            \ '\s*,\s*', '\\|', 'g'
-                            \ )
-            endif
-        endif
-    else
-        " A specific list was provided, use it
-    endif
-
+    
    " Loop through all the syntax groupnames, and build a
-    " syntax file which contains these names.  This can
+    " syntax file which contains these names.  This can 
    " work generically for any filetype that does not already
    " have a plugin defined.
    " This ASSUMES the syntax groupname BEGINS with the name
-    " of the filetype.  From my casual viewing of the vim7\syntax
-    " directory this is true for almost all syntax definitions.
-    " As an example, the SQL syntax groups have this pattern:
-    "     sqlType
-    "     sqlOperators
-    "     sqlKeyword ...
-    if !empty(list_parms) && empty(substitute(join(list_parms), '[a-zA-Z ]', '', 'g'))
-        " If list_parms only includes word characters, use it to limit
-        " the syntax elements.
-        " If using regex syntax list will fail to find those items, so
-        " simply grab the who syntax list.
-        redir @l
-        silent! exec 'syntax list '.join(list_parms)
-        redir END
-    else
-        redir @l
-        silent! exec 'syntax list'
-        redir END
-    endif
+    " of the filetype.  From my casual viewing of the vim7\syntax 
+    " directory.
+    redir @l
+    silent! exec 'syntax list '
+    redir END

    let syntax_full = "\n".@l
    let @l = saveL

-    if syntax_full =~ 'E28'
+    if syntax_full =~ 'E28' 
                \ || syntax_full =~ 'E411'
                \ || syntax_full =~ 'E415'
                \ || syntax_full =~ 'No Syntax items'
@@ -318,187 +176,106 @@ function! OmniSyntaxList(...)

    let filetype = substitute(&filetype, '\.', '_', 'g')

-    let list_exclude_groups = []
-    if a:0 > 0
-        " Do nothing since we have specific a specific list of groups
-    else
-        " Default the exclude group to nothing
-        let syntax_group_exclude_{filetype} = ''
-        " Check if there are any overrides specified for this filetype
-        if exists('g:omni_syntax_group_exclude_'.filetype)
-            let syntax_group_exclude_{filetype} =
-                        \ substitute( g:omni_syntax_group_exclude_{filetype},'\s\+','','g')
-            let list_exclude_groups = split(g:omni_syntax_group_exclude_{filetype}, ',')
-            if syntax_group_exclude_{filetype} =~ '\w'
-                let syntax_group_exclude_{filetype} =
-                            \ substitute( syntax_group_exclude_{filetype},
-                            \ '\s*,\s*', '\\|', 'g'
-                            \ )
-            endif
+    " Default the include group to include the requested syntax group
+    let syntax_group_include_{filetype} = ''
+    " Check if there are any overrides specified for this filetype
+    if exists('g:omni_syntax_group_include_'.filetype)
+        let syntax_group_include_{filetype} =
+                    \ substitute( g:omni_syntax_group_include_{filetype},'\s\+','','g') 
+        if syntax_group_include_{filetype} =~ '\w'
+            let syntax_group_include_{filetype} = 
+                        \ substitute( syntax_group_include_{filetype}, 
+                        \ '\s*,\s*', '\\|', 'g'
+                        \ )
        endif
    endif

-    if empty(list_parms)
-        let list_parms = [&filetype.'\w\+']
+    " Default the exclude group to nothing
+    let syntax_group_exclude_{filetype} = ''
+    " Check if there are any overrides specified for this filetype
+    if exists('g:omni_syntax_group_exclude_'.filetype)
+        let syntax_group_exclude_{filetype} =
+                    \ substitute( g:omni_syntax_group_exclude_{filetype},'\s\+','','g') 
+        if syntax_group_exclude_{filetype} =~ '\w' 
+            let syntax_group_exclude_{filetype} = 
+                        \ substitute( syntax_group_exclude_{filetype}, 
+                        \ '\s*,\s*', '\\|', 'g'
+                        \ )
+        endif
    endif

+    " Sometimes filetypes can be composite names, like c.doxygen
+    " Loop through each individual part looking for the syntax
+    " items specific to each individual filetype.
    let syn_list = ''
-    let index    = 0
-    for group_regex in list_parms
-        " Sometimes filetypes can be composite names, like c.doxygen
-        " Loop through each individual part looking for the syntax
-        " items specific to each individual filetype.
-        " let ftindex  = 0
-        " let ftindex  = match(syntax_full, group_regex, ftindex)
+    let ftindex  = 0
+    let ftindex  = match(&filetype, '\w\+', ftindex)

-        " while ftindex > -1
-            " let ft_part_name = matchstr( syntax_full, '\w\+', ftindex )
+    while ftindex > -1
+        let ft_part_name = matchstr( &filetype, '\w\+', ftindex )

-            " Syntax rules can contain items for more than just the current
-            " filetype.  They can contain additional items added by the user
-            " via autocmds or their vimrc.
-            " Some syntax files can be combined (html, php, jsp).
-            " We want only items that begin with the filetype we are interested in.
-            let next_group_regex = '\n' .
-                        \ '\zs'.group_regex.'\ze'.
-                        \ '\s\+xxx\s\+'
-            let index    = match(syntax_full, next_group_regex, index)
+        " Syntax rules can contain items for more than just the current 
+        " filetype.  They can contain additional items added by the user
+        " via autocmds or their vimrc.
+        " Some syntax files can be combined (html, php, jsp).
+        " We want only items that begin with the filetype we are interested in.
+        let next_group_regex = '\n' .
+                    \ '\zs'.ft_part_name.'\w\+\ze'.
+                    \ '\s\+xxx\s\+' 
+        let index    = 0
+        let index    = match(syntax_full, next_group_regex, index)

-            " For the matched group name, strip off any of the regex special
-            " characters and see if we get a match with the current syntax
-            if index == -1 && exists('b:current_syntax') && substitute(group_regex, '[^a-zA-Z ]\+.*', '', 'g') !~ '^'.b:current_syntax
-                " There appears to be two standards when writing syntax files.
-                " Either items begin as:
-                "     syn keyword {filetype}Keyword         values ...
-                "     let b:current_syntax = "sql"
-                "     let b:current_syntax = "sqlanywhere"
-                " Or
-                "     syn keyword {syntax_filename}Keyword  values ...
-                "     let b:current_syntax = "mysql"
-                " So, we will make the format of finding the syntax group names
-                " a bit more flexible and look for both if the first fails to
-                " find a match.
-                let next_group_regex = '\n' .
-                            \ '\zs'.b:current_syntax.'\w\+\ze'.
-                            \ '\s\+xxx\s\+'
-                let index    = 0
-                let index    = match(syntax_full, next_group_regex, index)
+        while index > -1
+            let group_name = matchstr( syntax_full, '\w\+', index )
+
+            let get_syn_list = 1
+            " if syntax_group_include_{&filetype} == ''
+            "     if syntax_group_exclude_{&filetype} != ''
+            "         if '\<'.syntax_group_exclude_{&filetype}.'\>' =~ '\<'.group_name.'\>'
+            "             let get_syn_list = 0
+            "         endif
+            "     endif
+            " else
+            "     if '\<'.syntax_group_include_{&filetype}.'\>' !~ '\<'.group_name.'\>'
+            "         let get_syn_list = 0
+            "     endif
+            " endif
+            if syntax_group_exclude_{filetype} != ''
+                if '\<'.syntax_group_exclude_{filetype}.'\>' =~ '\<'.group_name.'\>'
+                    let get_syn_list = 0
+                endif
            endif
-
-            while index > -1
-                let group_name = matchstr( syntax_full, '\w\+', index )
-
-                let get_syn_list = 1
-                for exclude_group_name in list_exclude_groups
-                    if '\<'.exclude_group_name.'\>' =~ '\<'.group_name.'\>'
+        
+            if get_syn_list == 1
+                if syntax_group_include_{filetype} != ''
+                    if '\<'.syntax_group_include_{filetype}.'\>' !~ '\<'.group_name.'\>'
                        let get_syn_list = 0
                    endif
-                endfor
+                endif
+            endif

-                " This code is no longer needed in version 6.0 since we have
-                " augmented the syntax list command to only retrieve the syntax
-                " groups we are interested in.
-                "
-                " if get_syn_list == 1
-                "     if syntax_group_include_{filetype} != ''
-                "         if '\<'.syntax_group_include_{filetype}.'\>' !~ '\<'.group_name.'\>'
-                "             let get_syn_list = 0
-                "         endif
-                "     endif
+            if get_syn_list == 1
+                " Pass in the full syntax listing, plus the group name we 
+                " are interested in.
+                let extra_syn_list = s:SyntaxCSyntaxGroupItems(group_name, syntax_full)
+
+                " if !empty(extra_syn_list)
+                "     for elem in extra_syn_list
+                "         let item = {'word':elem, 'kind':'t', 'info':group_name}
+                "         let compl_list += [item]
+                "     endfor
                " endif

-                if get_syn_list == 1
-                    " Pass in the full syntax listing, plus the group name we
-                    " are interested in.
-                    let extra_syn_list = s:SyntaxCSyntaxGroupItems(group_name, syntax_full)
-                    let syn_list = syn_list . extra_syn_list . "\n"
-                endif
+                let syn_list = syn_list . extra_syn_list . "\n"
+            endif

-                let index = index + strlen(group_name)
-                let index = match(syntax_full, next_group_regex, index)
-            endwhile
+            let index = index + strlen(group_name)
+            let index = match(syntax_full, next_group_regex, index)
+        endwhile

-            " let ftindex  = ftindex + len(ft_part_name)
-            " let ftindex  = match( syntax_full, group_regex, ftindex )
-        " endwhile
-    endfor
-
-"   " Sometimes filetypes can be composite names, like c.doxygen
-"   " Loop through each individual part looking for the syntax
-"   " items specific to each individual filetype.
-"   let syn_list = ''
-"   let ftindex  = 0
-"   let ftindex  = match(&filetype, '\w\+', ftindex)
-
-"   while ftindex > -1
-"       let ft_part_name = matchstr( &filetype, '\w\+', ftindex )
-
-"       " Syntax rules can contain items for more than just the current
-"       " filetype.  They can contain additional items added by the user
-"       " via autocmds or their vimrc.
-"       " Some syntax files can be combined (html, php, jsp).
-"       " We want only items that begin with the filetype we are interested in.
-"       let next_group_regex = '\n' .
-"                   \ '\zs'.ft_part_name.'\w\+\ze'.
-"                   \ '\s\+xxx\s\+'
-"       let index    = 0
-"       let index    = match(syntax_full, next_group_regex, index)
-
-"       if index == -1 && exists('b:current_syntax') && ft_part_name != b:current_syntax
-"           " There appears to be two standards when writing syntax files.
-"           " Either items begin as:
-"           "     syn keyword {filetype}Keyword         values ...
-"           "     let b:current_syntax = "sql"
-"           "     let b:current_syntax = "sqlanywhere"
-"           " Or
-"           "     syn keyword {syntax_filename}Keyword  values ...
-"           "     let b:current_syntax = "mysql"
-"           " So, we will make the format of finding the syntax group names
-"           " a bit more flexible and look for both if the first fails to
-"           " find a match.
-"           let next_group_regex = '\n' .
-"                       \ '\zs'.b:current_syntax.'\w\+\ze'.
-"                       \ '\s\+xxx\s\+'
-"           let index    = 0
-"           let index    = match(syntax_full, next_group_regex, index)
-"       endif
-
-"       while index > -1
-"           let group_name = matchstr( syntax_full, '\w\+', index )
-
-"           let get_syn_list = 1
-"           for exclude_group_name in list_exclude_groups
-"               if '\<'.exclude_group_name.'\>' =~ '\<'.group_name.'\>'
-"                   let get_syn_list = 0
-"               endif
-"           endfor
-
-"           " This code is no longer needed in version 6.0 since we have
-"           " augmented the syntax list command to only retrieve the syntax
-"           " groups we are interested in.
-"           "
-"           " if get_syn_list == 1
-"           "     if syntax_group_include_{filetype} != ''
-"           "         if '\<'.syntax_group_include_{filetype}.'\>' !~ '\<'.group_name.'\>'
-"           "             let get_syn_list = 0
-"           "         endif
-"           "     endif
-"           " endif
-
-"           if get_syn_list == 1
-"               " Pass in the full syntax listing, plus the group name we
-"               " are interested in.
-"               let extra_syn_list = s:SyntaxCSyntaxGroupItems(group_name, syntax_full)
-"               let syn_list = syn_list . extra_syn_list . "\n"
-"           endif
-
-"           let index = index + strlen(group_name)
-"           let index = match(syntax_full, next_group_regex, index)
-"       endwhile
-
-"       let ftindex  = ftindex + len(ft_part_name)
-"       let ftindex  = match( &filetype, '\w\+', ftindex )
-"   endwhile
+        let ftindex  = ftindex + len(ft_part_name)
+        let ftindex  = match( &filetype, '\w\+', ftindex )
+    endwhile

    " Convert the string to a List and sort it.
    let compl_list = sort(split(syn_list))
@@ -535,13 +312,9 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
    "     \zs          - start the match
    "     .\{-}        - everything ...
    "     \ze          - end the match
-    "     \(           - start a group or 2 potential matches
    "     \n\w         - at the first newline starting with a character
-    "     \|           - 2nd potential match
-    "     \%$          - matches end of the file or string
-    "     \)           - end a group
-    let syntax_group = matchstr(a:syntax_full,
-                \ "\n".a:group_name.'\s\+xxx\s\+\zs.\{-}\ze\(\n\w\|\%$\)'
+    let syntax_group = matchstr(a:syntax_full, 
+                \ "\n".a:group_name.'\s\+xxx\s\+\zs.\{-}\ze'."\n".'\w'
                \ )

    if syntax_group != ""
@@ -550,97 +323,26 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )

        " We only want the words for the lines begining with
        " containedin, but there could be other items.
-
+        
        " Tried to remove all lines that do not begin with contained
        " but this does not work in all cases since you can have
        "    contained nextgroup=...
        " So this will strip off the ending of lines with known
        " keywords.
-        let syn_list = substitute(
+        let syn_list = substitute( 
                    \    syntax_group, '\<\('.
                    \    substitute(
                    \      escape(s:syn_remove_words, '\\/.*$^~[]')
                    \      , ',', '\\|', 'g'
                    \    ).
                    \    '\).\{-}\%($\|'."\n".'\)'
-                    \    , "\n", 'g'
+                    \    , "\n", 'g' 
                    \  )

-        " Attempt to deal with lines using the match syntax
-        " javaScriptDocTags xxx match /@\(param\|argument\|requires\|file\)\>/
-        " Though it can use any types of regex, so this plugin will attempt
-        " to restrict it
-        " 1.  Only use \( or \%( constructs remove all else
-        " 2   Remove and []s
-        " 3.  Account for match //constructs
-        "                       \%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?
-        " 4.  Hope for the best
-        "
-        "
-        let syn_list_old = syn_list
-        while syn_list =~ '\<match\>\s\+\/'
-            if syn_list =~ 'perlElseIfError'
-                let syn_list = syn_list
-            endif
-            " Check if the match has words at least 3 characters long
-            if syn_list =~ '\<match \/\zs.\{-}\<\w\{3,}\>.\{-}\ze\\\@<!\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+'
-                " Remove everything after / and before the first \(
-                let syn_list = substitute( syn_list, '\<match \/\zs.\{-}\ze\\%\?(.\{-}\\\@<!\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+', '', 'g' )
-                " Remove everything after \) and up to the ending /
-                let syn_list = substitute( syn_list, '\<match \/.\{-}\\)\zs.\{-}\ze\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+', '', 'g' )
-
-                " Remove any character classes
-                " let syn_list = substitute( syn_list, '\<match /\zs.\{-}\[[^]]*\].\{-}\ze\/ ', '', 'g' )
-                let syn_list = substitute( syn_list, '\%(\<match \/[^/]\{-}\)\@<=\[[^]]*\]\ze.\{-}\\\@<!\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?', '', 'g' )
-                " Remove any words < 3 characters
-                let syn_list = substitute( syn_list, '\%(\<match \/[^/]\{-}\)\@<=\<\w\{1,2}\>\ze.\{-}\\\@<!\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+', '', 'g' )
-                " Remove all non-word characters
-                " let syn_list = substitute( syn_list, '\<match /\zs.\{-}\<\W\+\>.\{-}\ze\/ ', "", 'g' )
-                " let syn_list = substitute( syn_list, '\%(\<match \/[^/]\{-}\)\@<=\W\+\ze.\{-}\/ ', ' ', 'g' )
-                " Do this by using the outer substitue() call to gather all
-                " text between the match /.../ tags.
-                " The inner substitute() call operates on the text selected
-                " and replaces all non-word characters.
-                let syn_list = substitute( syn_list, '\<match \/\zs\(.\{-}\)\ze\\\@<!\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+'
-                            \ , '\=substitute(submatch(1), "\\W\\+", " ", "g")'
-                            \ , 'g' )
-                " Remove the match / / syntax
-                let syn_list = substitute( syn_list, '\<match \/\(.\{-}\)\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+', '\1', 'g' )
-            else
-                " No words long enough, remove the match
-                " Remove the match syntax
-                " let syn_list = substitute( syn_list, '\<match \/[^\/]*\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+', '', 'g' )
-                let syn_list = substitute( syn_list, '\<match \/\%(.\{-}\)\?\/\%(\%(ms\|me\|hs\|he\|rs\|re\|lc\)\S\+\)\?\s\+', '', 'g' )
-            endif
-            if syn_list =~ '\<match\>\s\+\/'
-                " Problem removing the match / / tags
-                let syn_list = ''
-            endif
-        endwhile
-
-
-        " Now strip off the newline + blank space + contained.
-        " Also include lines with nextgroup=@someName skip_key_words syntax_element
-                    " \    syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\|nextgroup=\)'
-                    " \    syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\|nextgroup=[@a-zA-Z,]*\)'
-        let syn_list = substitute(
-                    \    syn_list, '\<\(contained\|nextgroup=[@a-zA-Z,]*\)'
-                    \    , "", 'g'
-                    \ )
-
-        " This can leave lines like this
-        "     =@vimMenuList  skipwhite onoremenu
-        " Strip the special option keywords first
-        "     :h :syn-skipwhite*
-        let syn_list = substitute(
-                    \    syn_list, '\<\(skipwhite\|skipnl\|skipempty\)\>'
-                    \    , "", 'g'
-                    \ )
-
-        " Now remove the remainder of the nextgroup=@someName lines
-        let syn_list = substitute(
-                    \    syn_list, '\%(^\|\n\)\@<=\s*\(@\w\+\)'
-                    \    , "", 'g'
+        " Now strip off the newline + blank space + contained
+        let syn_list = substitute( 
+                    \    syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\)'
+                    \    , "", 'g' 
                    \ )

        if b:omni_syntax_use_iskeyword == 0
@@ -649,74 +351,17 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
            " This will replace non-word characters with spaces.
            let syn_list = substitute( syn_list, '[^0-9A-Za-z_ ]', ' ', 'g' )
        else
-            if g:omni_syntax_use_iskeyword_numeric == 1
-                " iskeyword can contain value like this
-                " 38,42,43,45,47-58,60-62,64-90,97-122,_,+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
-                " Numeric values convert to their ASCII equivalent using the
-                " nr2char() function.
-                "     &       38
-                "     *       42
-                "     +       43
-                "     -       45
-                "     ^       94
-                " Iterate through all numeric specifications and convert those
-                " to their ascii equivalent ensuring the character is printable.
-                " If so, add it to the list.
-                let accepted_chars = ''
-                for item in split(&iskeyword, ',')
-                    if item =~ '\d-\d'
-                        " This is a character range (ie 47-58),
-                        " cycle through each character within the range
-                        let [b:start, b:end] = split(item, '-')
-                        for range_item in range( b:start, b:end )
-                            if range_item <= 127 || g:omni_syntax_use_single_byte == 0
-                                if nr2char(range_item) =~ '\p'
-                                    let accepted_chars = accepted_chars . nr2char(range_item)
-                                endif
-                            endif
-                        endfor
-                    elseif item =~ '^\d\+$'
-                        " Only numeric, translate to a character
-                        if item < 127 || g:omni_syntax_use_single_byte == 0
-                            if nr2char(item) =~ '\p'
-                                let accepted_chars = accepted_chars . nr2char(item)
-                            endif
-                        endif
-                    else
-                        if char2nr(item) < 127 || g:omni_syntax_use_single_byte == 0
-                            if item =~ '\p'
-                                let accepted_chars = accepted_chars . item
-                            endif
-                        endif
-                    endif
-                endfor
-                " Escape special regex characters
-                " Looks like the wrong chars are escaped.  In a collection,
-                "      :h /[]
-                "      only `]', `\', `-' and `^' are special:
-                " let accepted_chars = escape(accepted_chars, '\\/.*$^~[]' )
-                let accepted_chars = escape(accepted_chars, ']\-^' )
-                " Remove all characters that are not acceptable
-                let syn_list = substitute( syn_list, '[^A-Za-z'.accepted_chars.']', ' ', 'g' )
-            else
-                let accept_chars = ','.&iskeyword.','
-                " Remove all character ranges
-                " let accept_chars = substitute(accept_chars, ',[^,]\+-[^,]\+,', ',', 'g')
-                let accept_chars = substitute(accept_chars, ',\@<=[^,]\+-[^,]\+,', '', 'g')
-                " Remove all numeric specifications
-                " let accept_chars = substitute(accept_chars, ',\d\{-},', ',', 'g')
-                let accept_chars = substitute(accept_chars, ',\@<=\d\{-},', '', 'g')
-                " Remove all commas
-                let accept_chars = substitute(accept_chars, ',', '', 'g')
-                " Escape special regex characters
-                " Looks like the wrong chars are escaped.  In a collection,
-                "      :h /[]
-                "      only `]', `\', `-' and `^' are special:
-                " let accept_chars = escape(accept_chars, '\\/.*$^~[]' )
-                let accept_chars = escape(accept_chars, ']\-^' )
-                " Remove all characters that are not acceptable
-                let syn_list = substitute( syn_list, '[^0-9A-Za-z_'.accept_chars.']', ' ', 'g' )
-            endif
+            let accept_chars = ','.&iskeyword.','
+            " Remove all character ranges
+            let accept_chars = substitute(accept_chars, ',[^,]\+-[^,]\+,', ',', 'g')
+            " Remove all numeric specifications
+            let accept_chars = substitute(accept_chars, ',\d\{-},', ',', 'g')
+            " Remove all commas
+            let accept_chars = substitute(accept_chars, ',', '', 'g')
+            " Escape special regex characters
+            let accept_chars = escape(accept_chars, '\\/.*$^~[]' )
+            " Remove all characters that are not acceptable
+            let syn_list = substitute( syn_list, '[^0-9A-Za-z_ '.accept_chars.']', ' ', 'g' )
        endif

        if b:omni_syntax_minimum_length > 0
@@ -729,27 +374,3 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )

    return syn_list
 endfunction
-
-function! OmniSyntaxShowChars(spec)
-  let result = []
-  for item in split(a:spec, ',')
-    if len(item) > 1
-      if item == '@-@'
-        call add(result, char2nr(item))
-      else
-        call extend(result, call('range', split(item, '-')))
-      endif
-    else
-      if item == '@'  " assume this is [A-Za-z]
-        for [c1, c2] in [['A', 'Z'], ['a', 'z']]
-          call extend(result, range(char2nr(c1), char2nr(c2)))
-        endfor
-      else
-        call add(result, char2nr(item))
-      endif
-    endif
-  endfor
-  return join(map(result, 'nr2char(v:val)'), ', ')
-endfunction
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -1,37 +1,30 @@
 " tar.vim: Handles browsing tarfiles
 "            AUTOLOAD PORTION
-" Date:			Apr 17, 2013
-" Version:		29
-" Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
+" Date:			Sep 29, 2006
+" Version:		11
+" Maintainer:	Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:		Vim License  (see vim's :help license)
 "
 "	Contains many ideas from Michael Toren's <tar.vim>
 "
-" Copyright:    Copyright (C) 2005-2011 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
-"               tar.vim and tarPlugin.vim are provided *as is* and comes
-"               with no warranty of any kind, either expressed or implied.
-"               By using this plugin, you agree that in no event will the
-"               copyright holder be liable for any damages resulting from
-"               the use of this software.
-"     call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"               tarPlugin.vim is provided *as is* and comes with no warranty
+"               of any kind, either expressed or implied. By using this
+"               plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+
 " ---------------------------------------------------------------------
 " Load Once: {{{1
-if &cp || exists("g:loaded_tar")
- finish
-endif
-let g:loaded_tar= "v29"
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of tar needs vim 7.2"
- echohl Normal
- finish
-endif
 let s:keepcpo= &cpo
 set cpo&vim
-"DechoTabOn
+if &cp || exists("g:loaded_tar") || v:version < 700
+ finish
+endif
+let g:loaded_tar= "v11"
 "call Decho("loading autoload/tar.vim")

 " ---------------------------------------------------------------------
@@ -48,51 +41,12 @@ endif
 if !exists("g:tar_writeoptions")
 let g:tar_writeoptions= "uf"
 endif
-if !exists("g:netrw_cygwin")
- if has("win32") || has("win95") || has("win64") || has("win16")
-  if &shell =~ '\%(\<bash\>\|\<zsh\>\)\%(\.exe\)\=$'
-   let g:netrw_cygwin= 1
-  else
-   let g:netrw_cygwin= 0
-  endif
- else
-  let g:netrw_cygwin= 0
- endif
-endif
-if !exists("g:tar_copycmd")
- if !exists("g:netrw_localcopycmd")
-  if has("win32") || has("win95") || has("win64") || has("win16")
-   if g:netrw_cygwin
-    let g:netrw_localcopycmd= "cp"
-   else
-    let g:netrw_localcopycmd= "copy"
-   endif
-  elseif has("unix") || has("macunix")
-   let g:netrw_localcopycmd= "cp"
-  else
-   let g:netrw_localcopycmd= ""
-  endif
- endif
- let g:tar_copycmd= g:netrw_localcopycmd
-endif
-if !exists("g:tar_extractcmd")
- let g:tar_extractcmd= "tar -xf"
-endif
-
-" set up shell quoting character
 if !exists("g:tar_shq")
- if exists("+shq") && exists("&shq") && &shq != ""
-  let g:tar_shq= &shq
- elseif has("win32") || has("win95") || has("win64") || has("win16")
-  if exists("g:netrw_cygwin") && g:netrw_cygwin
-   let g:tar_shq= "'"
-  else
-   let g:tar_shq= '"'
-  endif
- else
+ if has("unix")
  let g:tar_shq= "'"
+ else
+  let g:tar_shq= '"'
 endif
-" call Decho("g:tar_shq<".g:tar_shq.">")
 endif

 " ----------------
@@ -110,6 +64,7 @@ fun! tar#Browse(tarfile)
  if !executable(g:tar_cmd)
   redraw!
   echohl Error | echo '***error*** (tar#Browse) "'.g:tar_cmd.'" not available on your system'
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
   let &report= repkeep
 "   call Dret("tar#Browse")
   return
@@ -120,6 +75,7 @@ fun! tar#Browse(tarfile)
    " if its an url, don't complain, let url-handlers such as vim do its thing
    redraw!
    echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None
+"    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
   endif
   let &report= repkeep
 "   call Dret("tar#Browse : file<".a:tarfile."> not readable")
@@ -128,7 +84,7 @@ fun! tar#Browse(tarfile)
  if &ma != 1
   set ma
  endif
-  let b:tarfile= a:tarfile
+  let w:tarfile= a:tarfile

  setlocal noswapfile
  setlocal buftype=nofile
@@ -139,58 +95,45 @@ fun! tar#Browse(tarfile)

  " give header
 "  call Decho("printing header")
-  let lastline= line("$")
-  call setline(lastline+1,'" tar.vim version '.g:loaded_tar)
-  call setline(lastline+2,'" Browsing tarfile '.a:tarfile)
-  call setline(lastline+3,'" Select a file with cursor and press ENTER')
-  keepj $put =''
-  keepj sil! 0d
-  keepj $
+  exe "$put ='".'\"'." tar.vim version ".g:loaded_tar."'"
+  exe "$put ='".'\"'." Browsing tarfile ".a:tarfile."'"
+  exe "$put ='".'\"'." Select a file with cursor and press ENTER"."'"
+  0d
+  $

  let tarfile= a:tarfile
-  if has("win32unix") && executable("cygpath")
+  if has("win32") && executable("cygpath")
   " assuming cygwin
-   let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
+   let tarfile=substitute(system("cygpath -u ".tarfile),'\n$','','e')
  endif
  let curlast= line("$")
  if tarfile =~# '\.\(gz\|tgz\)$'
-"   call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-  elseif tarfile =~# '\.lrp'
-"   call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
-   exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
-  elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$'
-"   call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-   exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-  elseif tarfile =~# '\.\(lzma\|tlz\)$'
-"   call Decho("3: exe silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-   exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-  elseif tarfile =~# '\.\(xz\|txz\)$'
-"   call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-   exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+"   call Decho("exe silent r! gzip -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_browseoptions." - ")
+   exe "silent r! gzip -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_browseoptions." - "
+  elseif tarfile =~# '\.bz2$'
+"   call Decho("exe silent r! bzip2 -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_browseoptions." - ")
+   exe "silent r! bzip2 -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_browseoptions." - "
  else
-   if tarfile =~ '^\s*-'
-    " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
-    let tarfile = substitute(tarfile, '-', './-', '')
-   endif
-"   call Decho("4: exe silent r! ".g:tar_cmd." -".g:tar_browseoptions." ".shellescape(tarfile,0))
-   exe "sil! r! ".g:tar_cmd." -".g:tar_browseoptions." ".shellescape(tarfile,1)
+"   call Decho("exe silent r! ".g:tar_cmd." -".g:tar_browseoptions." ".g:tar_shq.tarfile.g:tar_shq)
+   exe "silent r! ".g:tar_cmd." -".g:tar_browseoptions." ".g:tar_shq.tarfile.g:tar_shq
  endif
  if v:shell_error != 0
   redraw!
   echohl WarningMsg | echo "***warning*** (tar#Browse) please check your g:tar_browseoptions<".g:tar_browseoptions.">"
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 "   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
   return
  endif
  if line("$") == curlast || ( line("$") == (curlast + 1) && getline("$") =~ '\c\%(warning\|error\|inappropriate\|unrecognized\)')
   redraw!
   echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
-   keepj sil! %d
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   silent %d
   let eikeep= &ei
   set ei=BufReadCmd,FileReadCmd
-   exe "r ".fnameescape(a:tarfile)
+   exe "r ".a:tarfile
   let &ei= eikeep
-   keepj sil! 1d
+   1d
 "   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
   return
  endif
@@ -199,25 +142,18 @@ fun! tar#Browse(tarfile)
  noremap <silent> <buffer> <cr> :call <SID>TarBrowseSelect()<cr>

  let &report= repkeep
-"  call Dret("tar#Browse : b:tarfile<".b:tarfile.">")
+"  call Dret("tar#Browse : w:tarfile<".w:tarfile.">")
 endfun

 " ---------------------------------------------------------------------
 " TarBrowseSelect: {{{2
 fun! s:TarBrowseSelect()
-"  call Dfunc("TarBrowseSelect() b:tarfile<".b:tarfile."> curfile<".expand("%").">")
+"  call Dfunc("TarBrowseSelect() w:tarfile<".w:tarfile."> curfile<".expand("%").">")
  let repkeep= &report
  set report=10
  let fname= getline(".")
 "  call Decho("fname<".fname.">")

-  if !exists("g:tar_secure") && fname =~ '^\s*-\|\s\+-'
-   redraw!
-   echohl WarningMsg | echo '***warning*** (tar#BrowseSelect) rejecting tarfile member<'.fname.'> because of embedded "-"'
-"   call Dret('tar#BrowseSelect : rejecting tarfile member<'.fname.'> because of embedded "-"')
-   return
-  endif
-
  " sanity check
  if fname =~ '^"'
   let &report= repkeep
@@ -225,23 +161,19 @@ fun! s:TarBrowseSelect()
   return
  endif

-  " about to make a new window, need to use b:tarfile
-  let tarfile= b:tarfile
+  " about to make a new window, need to use w:tarfile
+  let tarfile= w:tarfile
  let curfile= expand("%")
-  if has("win32unix") && executable("cygpath")
+  if has("win32") && executable("cygpath")
   " assuming cygwin
-   let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
+   let tarfile=substitute(system("cygpath -u ".tarfile),'\n$','','e')
  endif

  new
-  if !exists("g:tar_nomax") || g:tar_nomax == 0
-   wincmd _
-  endif
+  wincmd _
  let s:tblfile_{winnr()}= curfile
-  call tar#Read("tarfile:".tarfile.'::'.fname,1)
+  call tar#Read("tarfile:".tarfile.':'.fname,1)
  filetype detect
-  set nomod
-  exe 'com! -buffer -nargs=? -complete=file TarDiff	:call tar#Diff(<q-args>,"'.fnameescape(fname).'")'

  let &report= repkeep
 "  call Dret("TarBrowseSelect : s:tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
@@ -253,98 +185,48 @@ fun! tar#Read(fname,mode)
 "  call Dfunc("tar#Read(fname<".a:fname.">,mode=".a:mode.")")
  let repkeep= &report
  set report=10
-  let tarfile = substitute(a:fname,'tarfile:\(.\{-}\)::.*$','\1','')
-  let fname   = substitute(a:fname,'tarfile:.\{-}::\(.*\)$','\1','')
-  if has("win32unix") && executable("cygpath")
+  let tarfile = substitute(a:fname,'tarfile:\(.\{-}\):.*$','\1','')
+  let fname   = substitute(a:fname,'tarfile:.\{-}:\(.*\)$','\1','')
+  if has("win32") && executable("cygpath")
   " assuming cygwin
-   let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
+   let tarfile=substitute(system("cygpath -u ".tarfile),'\n$','','e')
  endif
 "  call Decho("tarfile<".tarfile.">")
 "  call Decho("fname<".fname.">")

-  if  fname =~ '\.bz2$' && executable("bzcat")
-   let decmp= "|bzcat"
-   let doro = 1
-  elseif      fname =~ '\.gz$'  && executable("zcat")
-   let decmp= "|zcat"
-   let doro = 1
-  elseif  fname =~ '\.lzma$' && executable("lzcat")
-   let decmp= "|lzcat"
-   let doro = 1
-  elseif  fname =~ '\.xz$' && executable("xzcat")
-   let decmp= "|xzcat"
-   let doro = 1
+  if tarfile =~# '\.\(gz\|tgz\)$'
+"   call Decho("exe silent r! gzip -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -OPxf - '".fname."'")
+   exe "silent r! gzip -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_readoptions." - '".fname."'"
+  elseif tarfile =~# '\.bz2$'
+"   call Decho("exe silent r! bzip2 -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_readoptions." - '".fname."'")
+   exe "silent r! bzip2 -d -c ".g:tar_shq.tarfile.g:tar_shq."| ".g:tar_cmd." -".g:tar_readoptions." - '".fname."'"
  else
-   let decmp=""
-   let doro = 0
-   if fname =~ '\.bz2$\|\.gz$\|\.lzma$\|\.xz$\|\.zip$\|\.Z$'
-    setlocal bin
-   endif
+"   call Decho("exe silent r! ".g:tar_cmd." -".g:tar_readoptions." ".g:tar_shq.tarfile.g:tar_shq." ".g:tar_shq.fname.g:tar_shq)
+   exe "silent r! ".g:tar_cmd." -".g:tar_readoptions." ".g:tar_shq.tarfile.g:tar_shq." ".g:tar_shq.fname.g:tar_shq
  endif
-
-  if exists("g:tar_secure")
-   let tar_secure= " -- "
-  else
-   let tar_secure= " "
-  endif
-  if tarfile =~# '\.bz2$'
-"   call Decho("7: exe silent r! bzip2 -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
-   exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-  elseif tarfile =~# '\.\(gz\|tgz\)$'
-"   call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1))
-   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-  elseif tarfile =~# '\.lrp$'
-"   call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
-   exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-  elseif tarfile =~# '\.lzma$'
-"   call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
-   exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-  elseif tarfile =~# '\.\(xz\|txz\)$'
-"   call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
-   exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-  else
-   if tarfile =~ '^\s*-'
-    " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
-    let tarfile = substitute(tarfile, '-', './-', '')
-   endif
-"   call Decho("8: exe silent r! ".g:tar_cmd." -".g:tar_readoptions.tar_secure.shellescape(tarfile,1)." ".shellescape(fname,1).decmp)
-   exe "silent r! ".g:tar_cmd." -".g:tar_readoptions.shellescape(tarfile,1)." ".tar_secure.shellescape(fname,1).decmp
-  endif
-
-  if doro
-   " because the reverse process of compressing changed files back into the tarball is not currently supported
-   setlocal ro
-  endif
-
-  let b:tarfile= a:fname
-  exe "file tarfile::".fnameescape(fname)
+  let w:tarfile= a:fname
+  exe "file tarfile:".fname

  " cleanup
-  keepj sil! 0d
+  0d
  set nomod

  let &report= repkeep
-"  call Dret("tar#Read : b:tarfile<".b:tarfile.">")
+"  call Dret("tar#Read : w:tarfile<".w:tarfile.">")
 endfun

 " ---------------------------------------------------------------------
 " tar#Write: {{{2
 fun! tar#Write(fname)
-"  call Dfunc("tar#Write(fname<".a:fname.">) b:tarfile<".b:tarfile."> tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
+"  call Dfunc("tar#Write(fname<".a:fname.">) w:tarfile<".w:tarfile."> tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
  let repkeep= &report
  set report=10

-  if !exists("g:tar_secure") && a:fname =~ '^\s*-\|\s\+-'
-   redraw!
-   echohl WarningMsg | echo '***warning*** (tar#Write) rejecting tarfile member<'.a:fname.'> because of embedded "-"'
-"   call Dret('tar#Write : rejecting tarfile member<'.fname.'> because of embedded "-"')
-   return
-  endif
-
  " sanity checks
  if !executable(g:tar_cmd)
   redraw!
   echohl Error | echo '***error*** (tar#Browse) "'.g:tar_cmd.'" not available on your system'
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
   let &report= repkeep
 "   call Dret("tar#Write")
   return
@@ -352,6 +234,7 @@ fun! tar#Write(fname)
  if !exists("*mkdir")
   redraw!
   echohl Error | echo "***error*** (tar#Write) sorry, mkdir() doesn't work on your system" | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
   let &report= repkeep
 "   call Dret("tar#Write")
   return
@@ -368,10 +251,11 @@ fun! tar#Write(fname)

  " attempt to change to the indicated directory
  try
-   exe "cd ".fnameescape(tmpdir)
+   exe "cd ".escape(tmpdir,' \')
  catch /^Vim\%((\a\+)\)\=:E344/
   redraw!
   echohl Error | echo "***error*** (tar#Write) cannot cd to temporary directory" | Echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
   let &report= repkeep
 "   call Dret("tar#Write")
   return
@@ -386,86 +270,66 @@ fun! tar#Write(fname)
  cd _ZIPVIM_
 "  call Decho("current directory now: ".getcwd())

-  let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','')
-  let fname   = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','')
+  let tarfile = substitute(w:tarfile,'tarfile:\(.\{-}\):.*$','\1','')
+  let fname   = substitute(w:tarfile,'tarfile:.\{-}:\(.*\)$','\1','')

  " handle compressed archives
-  if tarfile =~# '\.bz2'
-   call system("bzip2 -d -- ".shellescape(tarfile,0))
-   let tarfile = substitute(tarfile,'\.bz2','','e')
-   let compress= "bzip2 -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
-  elseif tarfile =~# '\.gz'
-   call system("gzip -d -- ".shellescape(tarfile,0))
+  if tarfile =~# '\.gz'
+   call system("gzip -d ".tarfile)
   let tarfile = substitute(tarfile,'\.gz','','e')
-   let compress= "gzip -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
+   let compress= "gzip '".tarfile."'"
  elseif tarfile =~# '\.tgz'
-   call system("gzip -d -- ".shellescape(tarfile,0))
+   call system("gzip -d ".tarfile)
   let tarfile = substitute(tarfile,'\.tgz','.tar','e')
-   let compress= "gzip -- ".shellescape(tarfile,0)
+   let compress= "gzip '".tarfile."'"
   let tgz     = 1
-"   call Decho("compress<".compress.">")
-  elseif tarfile =~# '\.xz'
-   call system("xz -d -- ".shellescape(tarfile,0))
-   let tarfile = substitute(tarfile,'\.xz','','e')
-   let compress= "xz -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
-  elseif tarfile =~# '\.lzma'
-   call system("lzma -d -- ".shellescape(tarfile,0))
-   let tarfile = substitute(tarfile,'\.lzma','','e')
-   let compress= "lzma -- ".shellescape(tarfile,0)
-"   call Decho("compress<".compress.">")
+  elseif tarfile =~# '\.bz2'
+   call system("bzip2 -d ".tarfile)
+   let tarfile = substitute(tarfile,'\.bz2','','e')
+   let compress= "bzip2 '".tarfile."'"
  endif
-"  call Decho("tarfile<".tarfile.">")

  if v:shell_error != 0
   redraw!
   echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
  else

 "   call Decho("tarfile<".tarfile."> fname<".fname.">")
 
   if fname =~ '/'
    let dirpath = substitute(fname,'/[^/]\+$','','e')
-    if has("win32unix") && executable("cygpath")
-     let dirpath = substitute(system("cygpath ".shellescape(dirpath, 0)),'\n','','e')
+    if executable("cygpath")
+     let dirpath = substitute(system("cygpath ".dirpath),'\n','','e')
    endif
    call mkdir(dirpath,"p")
   endif
   if tarfile !~ '/'
    let tarfile= curdir.'/'.tarfile
   endif
-   if tarfile =~ '^\s*-'
-    " A file name starting with a dash may be taken as an option.  Prepend ./ to avoid that.
-    let tarfile = substitute(tarfile, '-', './-', '')
-   endif
 "   call Decho("tarfile<".tarfile."> fname<".fname.">")
 
-   if exists("g:tar_secure")
-    let tar_secure= " -- "
-   else
-    let tar_secure= " "
-   endif
-   exe "w! ".fnameescape(fname)
-   if has("win32unix") && executable("cygpath")
-    let tarfile = substitute(system("cygpath ".shellescape(tarfile,0)),'\n','','e')
+   exe "w! ".fname
+   if executable("cygpath")
+    let tarfile = substitute(system("cygpath ".tarfile),'\n','','e')
   endif
 
   " delete old file from tarfile
-"   call Decho("system(".g:tar_cmd." --delete -f ".shellescape(tarfile,0)." -- ".shellescape(fname,0).")")
-   call system(g:tar_cmd." --delete -f ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
+"   call Decho("tar --delete -f '".tarfile."' '".fname."'")
+   call system("tar --delete -f '".tarfile."' '".fname."'")
   if v:shell_error != 0
    redraw!
-    echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname) | echohl None
+    echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+"    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
   else
 
    " update tarfile with new file 
-"    call Decho(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
-    call system(g:tar_cmd." -".g:tar_writeoptions." ".shellescape(tarfile,0).tar_secure.shellescape(fname,0))
+"    call Decho("tar -".g:tar_writeoptions." '".tarfile."' '".fname."'")
+    call system("tar -".g:tar_writeoptions." '".tarfile."' '".fname."'")
    if v:shell_error != 0
     redraw!
-     echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".fnameescape(tarfile)." with ".fnameescape(fname) | echohl None
+     echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+"     call inputsave()|call input("Press <cr> to continue")|call inputrestore()
    elseif exists("compress")
 "     call Decho("call system(".compress.")")
     call system(compress)
@@ -481,13 +345,13 @@ fun! tar#Write(fname)
 "    call Decho("handle writing <".tarfile."> across network to <".s:tblfile_{winnr()}.">")
    let tblfile= s:tblfile_{winnr()}
    1split|enew
-    let binkeep= &l:binary
+    let binkeep= &binary
    let eikeep = &ei
    set binary ei=all
-    exe "e! ".fnameescape(tarfile)
+    exe "e! ".tarfile
    call netrw#NetWrite(tblfile)
-    let &ei       = eikeep
-    let &l:binary = binkeep
+    let &ei     = eikeep
+    let &binary = binkeep
    q!
    unlet s:tblfile_{winnr()}
   endif
@@ -496,7 +360,7 @@ fun! tar#Write(fname)
  " cleanup and restore current directory
  cd ..
  call s:Rmdir("_ZIPVIM_")
-  exe "cd ".fnameescape(curdir)
+  exe "cd ".escape(curdir,' \')
  setlocal nomod

  let &report= repkeep
@@ -504,123 +368,23 @@ fun! tar#Write(fname)
 endfun

 " ---------------------------------------------------------------------
-" tar#Diff: {{{2
-fun! tar#Diff(userfname,fname)
-"  call Dfunc("tar#Diff(userfname<".a:userfname."> fname<".a:fname.")")
-  let fname= a:fname
-  if a:userfname != ""
-   let fname= a:userfname
-  endif
-  if filereadable(fname)
-   " sets current file (from tarball) for diff'ing
-   " splits window vertically
-   " opens original file, sets it for diff'ing
-   " sets up b:tardiff_otherbuf variables so each buffer knows about the other (for closing purposes)
-   diffthis
-   wincmd v
-   exe "e ".fnameescape(fname)
-   diffthis
-  else
-   redraw!
-   echo "***warning*** unable to read file<".fname.">"
-  endif
-"  call Dret("tar#Diff")
-endfun
-
-" ---------------------------------------------------------------------
-" s:Rmdir: {{{2
+" Rmdir: {{{2
 fun! s:Rmdir(fname)
 "  call Dfunc("Rmdir(fname<".a:fname.">)")
  if has("unix")
-   call system("/bin/rm -rf -- ".shellescape(a:fname,0))
+   call system("/bin/rm -rf ".a:fname)
  elseif has("win32") || has("win95") || has("win64") || has("win16")
   if &shell =~? "sh$"
-    call system("/bin/rm -rf -- ".shellescape(a:fname,0))
+    call system("/bin/rm -rf ".a:fname)
   else
-    call system("del /S ".shellescape(a:fname,0))
+    call system("del /S ".a:fname)
   endif
  endif
 "  call Dret("Rmdir")
 endfun

-" ---------------------------------------------------------------------
-" tar#Vimuntar: installs a tarball in the user's .vim / vimfiles directory {{{2
-fun! tar#Vimuntar(...)
-"  call Dfunc("tar#Vimuntar() a:0=".a:0." a:1<".(exists("a:1")? a:1 : "-n/a-").">")
-  let tarball = expand("%")
-"  call Decho("tarball<".tarball.">")
-  let tarbase = substitute(tarball,'\..*$','','')
-"  call Decho("tarbase<".tarbase.">")
-  let tarhome = expand("%:p")
-  if has("win32") || has("win95") || has("win64") || has("win16")
-   let tarhome= substitute(tarhome,'\\','/','g')
-  endif
-  let tarhome= substitute(tarhome,'/[^/]*$','','')
-"  call Decho("tarhome<".tarhome.">")
-  let tartail = expand("%:t")
-"  call Decho("tartail<".tartail.">")
-  let curdir  = getcwd()
-"  call Decho("curdir <".curdir.">")
-  " set up vimhome
-  if a:0 > 0 && a:1 != ""
-   let vimhome= a:1
-  else
-   let vimhome= vimball#VimballHome()
-  endif
-"  call Decho("vimhome<".vimhome.">")
-
-"  call Decho("curdir<".curdir."> vimhome<".vimhome.">")
-  if simplify(curdir) != simplify(vimhome)
-   " copy (possibly compressed) tarball to .vim/vimfiles
-"   call Decho(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-   call system(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-"   call Decho("exe cd ".fnameescape(vimhome))
-   exe "cd ".fnameescape(vimhome)
-  endif
-"  call Decho("getcwd<".getcwd().">")
-
-  " if necessary, decompress the tarball; then, extract it
-  if tartail =~ '\.tgz'
-   if executable("gunzip")
-    silent exe "!gunzip ".shellescape(tartail)
-   elseif executable("gzip")
-    silent exe "!gzip -d ".shellescape(tartail)
-   else
-    echoerr "unable to decompress<".tartail."> on this sytem"
-    if simplify(curdir) != simplify(tarhome)
-     " remove decompressed tarball, restore directory
-"     call Decho("delete(".tartail.".tar)")
-     call delete(tartail.".tar")
-"     call Decho("exe cd ".fnameescape(curdir))
-     exe "cd ".fnameescape(curdir)
-    endif
-"    call Dret("tar#Vimuntar")
-    return
-   endif
-  else
-   call vimball#Decompress(tartail,0)
-  endif
-  let extractcmd= netrw#WinPath(g:tar_extractcmd)
-"  call Decho("system(".extractcmd." ".shellescape(tarbase.".tar").")")
-  call system(extractcmd." ".shellescape(tarbase.".tar"))
-
-  " set up help
-  if filereadable("doc/".tarbase.".txt")
-"   call Decho("exe helptags ".getcwd()."/doc")
-   exe "helptags ".getcwd()."/doc"
-  endif
-
-  if simplify(tarhome) != simplify(vimhome)
-   " remove decompressed tarball, restore directory
-   call delete(vimhome."/".tarbase.".tar")
-   exe "cd ".fnameescape(curdir)
-  endif
-
-"  call Dret("tar#Vimuntar")
-endfun
-
-" =====================================================================
+" ------------------------------------------------------------------------
 " Modelines And Restoration: {{{1
 let &cpo= s:keepcpo
 unlet s:keepcpo
-" vim:ts=8 fdm=marker
+"  vim:ts=8 fdm=marker
@@ -1,923 +0,0 @@
-" Vim autoload file for the tohtml plugin.
-" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2013 Jun 19
-"
-" Additional contributors:
-"
-"	      Original by Bram Moolenaar <Bram@vim.org>
-"	      Diff2HTML() added by Christian Brabandt <cb@256bit.org>
-"
-"	      See Mercurial change logs for more!
-
-" this file uses line continuations
-let s:cpo_sav = &cpo
-set cpo&vim
-
-" Automatically find charsets from all encodings supported natively by Vim. With
-" the 8bit- and 2byte- prefixes, Vim can actually support more encodings than
-" this. Let the user specify these however since they won't be supported on
-" every system.
-"
-" Note, not all of Vim's supported encodings have a charset to use.
-"
-" Names in this list are from:
-"   http://www.iana.org/assignments/character-sets
-" g:tohtml#encoding_to_charset: {{{
-let g:tohtml#encoding_to_charset = {
-      \ 'latin1' : 'ISO-8859-1',
-      \ 'iso-8859-2' : 'ISO-8859-2',
-      \ 'iso-8859-3' : 'ISO-8859-3',
-      \ 'iso-8859-4' : 'ISO-8859-4',
-      \ 'iso-8859-5' : 'ISO-8859-5',
-      \ 'iso-8859-6' : 'ISO-8859-6',
-      \ 'iso-8859-7' : 'ISO-8859-7',
-      \ 'iso-8859-8' : 'ISO-8859-8',
-      \ 'iso-8859-9' : 'ISO-8859-9',
-      \ 'iso-8859-10' : '',
-      \ 'iso-8859-13' : 'ISO-8859-13',
-      \ 'iso-8859-14' : '',
-      \ 'iso-8859-15' : 'ISO-8859-15',
-      \ 'koi8-r' : 'KOI8-R',
-      \ 'koi8-u' : 'KOI8-U',
-      \ 'macroman' : 'macintosh',
-      \ 'cp437' : '',
-      \ 'cp775' : '',
-      \ 'cp850' : '',
-      \ 'cp852' : '',
-      \ 'cp855' : '',
-      \ 'cp857' : '',
-      \ 'cp860' : '',
-      \ 'cp861' : '',
-      \ 'cp862' : '',
-      \ 'cp863' : '',
-      \ 'cp865' : '',
-      \ 'cp866' : 'IBM866',
-      \ 'cp869' : '',
-      \ 'cp874' : '',
-      \ 'cp1250' : 'windows-1250',
-      \ 'cp1251' : 'windows-1251',
-      \ 'cp1253' : 'windows-1253',
-      \ 'cp1254' : 'windows-1254',
-      \ 'cp1255' : 'windows-1255',
-      \ 'cp1256' : 'windows-1256',
-      \ 'cp1257' : 'windows-1257',
-      \ 'cp1258' : 'windows-1258',
-      \ 'euc-jp' : 'EUC-JP',
-      \ 'sjis' : 'Shift_JIS',
-      \ 'cp932' : 'Shift_JIS',
-      \ 'cp949' : '',
-      \ 'euc-kr' : 'EUC-KR',
-      \ 'cp936' : 'GBK',
-      \ 'euc-cn' : 'GB2312',
-      \ 'big5' : 'Big5',
-      \ 'cp950' : 'Big5',
-      \ 'utf-8' : 'UTF-8',
-      \ 'ucs-2' : 'UTF-8',
-      \ 'ucs-2le' : 'UTF-8',
-      \ 'utf-16' : 'UTF-8',
-      \ 'utf-16le' : 'UTF-8',
-      \ 'ucs-4' : 'UTF-8',
-      \ 'ucs-4le' : 'UTF-8',
-      \ }
-lockvar g:tohtml#encoding_to_charset
-" Notes:
-"   1. All UCS/UTF are converted to UTF-8 because it is much better supported
-"   2. Any blank spaces are there because Vim supports it but at least one major
-"      web browser does not according to http://wiki.whatwg.org/wiki/Web_Encodings.
-" }}}
-
-" Only automatically find encodings supported natively by Vim, let the user
-" specify the encoding if it's not natively supported. This function is only
-" used when the user specifies the charset, they better know what they are
-" doing!
-"
-" Names in this list are from:
-"   http://www.iana.org/assignments/character-sets
-" g:tohtml#charset_to_encoding: {{{
-let g:tohtml#charset_to_encoding = {
-      \ 'iso_8859-1:1987' : 'latin1',
-      \ 'iso-ir-100' : 'latin1',
-      \ 'iso_8859-1' : 'latin1',
-      \ 'iso-8859-1' : 'latin1',
-      \ 'latin1' : 'latin1',
-      \ 'l1' : 'latin1',
-      \ 'ibm819' : 'latin1',
-      \ 'cp819' : 'latin1',
-      \ 'csisolatin1' : 'latin1',
-      \ 'iso_8859-2:1987' : 'iso-8859-2',
-      \ 'iso-ir-101' : 'iso-8859-2',
-      \ 'iso_8859-2' : 'iso-8859-2',
-      \ 'iso-8859-2' : 'iso-8859-2',
-      \ 'latin2' : 'iso-8859-2',
-      \ 'l2' : 'iso-8859-2',
-      \ 'csisolatin2' : 'iso-8859-2',
-      \ 'iso_8859-3:1988' : 'iso-8859-3',
-      \ 'iso-ir-109' : 'iso-8859-3',
-      \ 'iso_8859-3' : 'iso-8859-3',
-      \ 'iso-8859-3' : 'iso-8859-3',
-      \ 'latin3' : 'iso-8859-3',
-      \ 'l3' : 'iso-8859-3',
-      \ 'csisolatin3' : 'iso-8859-3',
-      \ 'iso_8859-4:1988' : 'iso-8859-4',
-      \ 'iso-ir-110' : 'iso-8859-4',
-      \ 'iso_8859-4' : 'iso-8859-4',
-      \ 'iso-8859-4' : 'iso-8859-4',
-      \ 'latin4' : 'iso-8859-4',
-      \ 'l4' : 'iso-8859-4',
-      \ 'csisolatin4' : 'iso-8859-4',
-      \ 'iso_8859-5:1988' : 'iso-8859-5',
-      \ 'iso-ir-144' : 'iso-8859-5',
-      \ 'iso_8859-5' : 'iso-8859-5',
-      \ 'iso-8859-5' : 'iso-8859-5',
-      \ 'cyrillic' : 'iso-8859-5',
-      \ 'csisolatincyrillic' : 'iso-8859-5',
-      \ 'iso_8859-6:1987' : 'iso-8859-6',
-      \ 'iso-ir-127' : 'iso-8859-6',
-      \ 'iso_8859-6' : 'iso-8859-6',
-      \ 'iso-8859-6' : 'iso-8859-6',
-      \ 'ecma-114' : 'iso-8859-6',
-      \ 'asmo-708' : 'iso-8859-6',
-      \ 'arabic' : 'iso-8859-6',
-      \ 'csisolatinarabic' : 'iso-8859-6',
-      \ 'iso_8859-7:1987' : 'iso-8859-7',
-      \ 'iso-ir-126' : 'iso-8859-7',
-      \ 'iso_8859-7' : 'iso-8859-7',
-      \ 'iso-8859-7' : 'iso-8859-7',
-      \ 'elot_928' : 'iso-8859-7',
-      \ 'ecma-118' : 'iso-8859-7',
-      \ 'greek' : 'iso-8859-7',
-      \ 'greek8' : 'iso-8859-7',
-      \ 'csisolatingreek' : 'iso-8859-7',
-      \ 'iso_8859-8:1988' : 'iso-8859-8',
-      \ 'iso-ir-138' : 'iso-8859-8',
-      \ 'iso_8859-8' : 'iso-8859-8',
-      \ 'iso-8859-8' : 'iso-8859-8',
-      \ 'hebrew' : 'iso-8859-8',
-      \ 'csisolatinhebrew' : 'iso-8859-8',
-      \ 'iso_8859-9:1989' : 'iso-8859-9',
-      \ 'iso-ir-148' : 'iso-8859-9',
-      \ 'iso_8859-9' : 'iso-8859-9',
-      \ 'iso-8859-9' : 'iso-8859-9',
-      \ 'latin5' : 'iso-8859-9',
-      \ 'l5' : 'iso-8859-9',
-      \ 'csisolatin5' : 'iso-8859-9',
-      \ 'iso-8859-10' : 'iso-8859-10',
-      \ 'iso-ir-157' : 'iso-8859-10',
-      \ 'l6' : 'iso-8859-10',
-      \ 'iso_8859-10:1992' : 'iso-8859-10',
-      \ 'csisolatin6' : 'iso-8859-10',
-      \ 'latin6' : 'iso-8859-10',
-      \ 'iso-8859-13' : 'iso-8859-13',
-      \ 'iso-8859-14' : 'iso-8859-14',
-      \ 'iso-ir-199' : 'iso-8859-14',
-      \ 'iso_8859-14:1998' : 'iso-8859-14',
-      \ 'iso_8859-14' : 'iso-8859-14',
-      \ 'latin8' : 'iso-8859-14',
-      \ 'iso-celtic' : 'iso-8859-14',
-      \ 'l8' : 'iso-8859-14',
-      \ 'iso-8859-15' : 'iso-8859-15',
-      \ 'iso_8859-15' : 'iso-8859-15',
-      \ 'latin-9' : 'iso-8859-15',
-      \ 'koi8-r' : 'koi8-r',
-      \ 'cskoi8r' : 'koi8-r',
-      \ 'koi8-u' : 'koi8-u',
-      \ 'macintosh' : 'macroman',
-      \ 'mac' : 'macroman',
-      \ 'csmacintosh' : 'macroman',
-      \ 'ibm437' : 'cp437',
-      \ 'cp437' : 'cp437',
-      \ '437' : 'cp437',
-      \ 'cspc8codepage437' : 'cp437',
-      \ 'ibm775' : 'cp775',
-      \ 'cp775' : 'cp775',
-      \ 'cspc775baltic' : 'cp775',
-      \ 'ibm850' : 'cp850',
-      \ 'cp850' : 'cp850',
-      \ '850' : 'cp850',
-      \ 'cspc850multilingual' : 'cp850',
-      \ 'ibm852' : 'cp852',
-      \ 'cp852' : 'cp852',
-      \ '852' : 'cp852',
-      \ 'cspcp852' : 'cp852',
-      \ 'ibm855' : 'cp855',
-      \ 'cp855' : 'cp855',
-      \ '855' : 'cp855',
-      \ 'csibm855' : 'cp855',
-      \ 'ibm857' : 'cp857',
-      \ 'cp857' : 'cp857',
-      \ '857' : 'cp857',
-      \ 'csibm857' : 'cp857',
-      \ 'ibm860' : 'cp860',
-      \ 'cp860' : 'cp860',
-      \ '860' : 'cp860',
-      \ 'csibm860' : 'cp860',
-      \ 'ibm861' : 'cp861',
-      \ 'cp861' : 'cp861',
-      \ '861' : 'cp861',
-      \ 'cp-is' : 'cp861',
-      \ 'csibm861' : 'cp861',
-      \ 'ibm862' : 'cp862',
-      \ 'cp862' : 'cp862',
-      \ '862' : 'cp862',
-      \ 'cspc862latinhebrew' : 'cp862',
-      \ 'ibm863' : 'cp863',
-      \ 'cp863' : 'cp863',
-      \ '863' : 'cp863',
-      \ 'csibm863' : 'cp863',
-      \ 'ibm865' : 'cp865',
-      \ 'cp865' : 'cp865',
-      \ '865' : 'cp865',
-      \ 'csibm865' : 'cp865',
-      \ 'ibm866' : 'cp866',
-      \ 'cp866' : 'cp866',
-      \ '866' : 'cp866',
-      \ 'csibm866' : 'cp866',
-      \ 'ibm869' : 'cp869',
-      \ 'cp869' : 'cp869',
-      \ '869' : 'cp869',
-      \ 'cp-gr' : 'cp869',
-      \ 'csibm869' : 'cp869',
-      \ 'windows-1250' : 'cp1250',
-      \ 'windows-1251' : 'cp1251',
-      \ 'windows-1253' : 'cp1253',
-      \ 'windows-1254' : 'cp1254',
-      \ 'windows-1255' : 'cp1255',
-      \ 'windows-1256' : 'cp1256',
-      \ 'windows-1257' : 'cp1257',
-      \ 'windows-1258' : 'cp1258',
-      \ 'extended_unix_code_packed_format_for_japanese' : 'euc-jp',
-      \ 'cseucpkdfmtjapanese' : 'euc-jp',
-      \ 'euc-jp' : 'euc-jp',
-      \ 'shift_jis' : 'sjis',
-      \ 'ms_kanji' : 'sjis',
-      \ 'sjis' : 'sjis',
-      \ 'csshiftjis' : 'sjis',
-      \ 'ibm-thai' : 'cp874',
-      \ 'csibmthai' : 'cp874',
-      \ 'ks_c_5601-1987' : 'cp949',
-      \ 'iso-ir-149' : 'cp949',
-      \ 'ks_c_5601-1989' : 'cp949',
-      \ 'ksc_5601' : 'cp949',
-      \ 'korean' : 'cp949',
-      \ 'csksc56011987' : 'cp949',
-      \ 'euc-kr' : 'euc-kr',
-      \ 'cseuckr' : 'euc-kr',
-      \ 'gbk' : 'cp936',
-      \ 'cp936' : 'cp936',
-      \ 'ms936' : 'cp936',
-      \ 'windows-936' : 'cp936',
-      \ 'gb_2312-80' : 'euc-cn',
-      \ 'iso-ir-58' : 'euc-cn',
-      \ 'chinese' : 'euc-cn',
-      \ 'csiso58gb231280' : 'euc-cn',
-      \ 'big5' : 'big5',
-      \ 'csbig5' : 'big5',
-      \ 'utf-8' : 'utf-8',
-      \ 'iso-10646-ucs-2' : 'ucs-2',
-      \ 'csunicode' : 'ucs-2',
-      \ 'utf-16' : 'utf-16',
-      \ 'utf-16be' : 'utf-16',
-      \ 'utf-16le' : 'utf-16le',
-      \ 'utf-32' : 'ucs-4',
-      \ 'utf-32be' : 'ucs-4',
-      \ 'utf-32le' : 'ucs-4le',
-      \ 'iso-10646-ucs-4' : 'ucs-4',
-      \ 'csucs4' : 'ucs-4'
-      \ }
-lockvar g:tohtml#charset_to_encoding
-"}}}
-
-func! tohtml#Convert2HTML(line1, line2) "{{{
-  let s:settings = tohtml#GetUserSettings()
-
-  if !&diff || s:settings.diff_one_file "{{{
-    if a:line2 >= a:line1
-      let g:html_start_line = a:line1
-      let g:html_end_line = a:line2
-    else
-      let g:html_start_line = a:line2
-      let g:html_end_line = a:line1
-    endif
-    runtime syntax/2html.vim "}}}
-  else "{{{
-    let win_list = []
-    let buf_list = []
-    windo | if &diff | call add(win_list, winbufnr(0)) | endif
-    let s:settings.whole_filler = 1
-    let g:html_diff_win_num = 0
-    for window in win_list
-      " switch to the next buffer to convert
-      exe ":" . bufwinnr(window) . "wincmd w"
-
-      " figure out whether current charset and encoding will work, if not
-      " default to UTF-8
-      if !exists('g:html_use_encoding') &&
-	    \ (((&l:fileencoding=='' || (&l:buftype!='' && &l:buftype!=?'help'))
-	    \      && &encoding!=?s:settings.vim_encoding)
-	    \ || &l:fileencoding!='' && &l:fileencoding!=?s:settings.vim_encoding)
-	echohl WarningMsg
-	echomsg "TOhtml: mismatched file encodings in Diff buffers, using UTF-8"
-	echohl None
-	let s:settings.vim_encoding = 'utf-8'
-	let s:settings.encoding = 'UTF-8'
-      endif
-
-      " set up for diff-mode conversion
-      let g:html_start_line = 1
-      let g:html_end_line = line('$')
-      let g:html_diff_win_num += 1
-
-      " convert this file
-      runtime syntax/2html.vim
-
-      " remember the HTML buffer for later combination
-      call add(buf_list, bufnr('%'))
-    endfor
-    unlet g:html_diff_win_num
-    call tohtml#Diff2HTML(win_list, buf_list)
-  endif "}}}
-
-  unlet g:html_start_line
-  unlet g:html_end_line
-  unlet s:settings
-endfunc "}}}
-
-func! tohtml#Diff2HTML(win_list, buf_list) "{{{
-  let xml_line = ""
-  let tag_close = '>'
-
-  let s:old_paste = &paste
-  set paste
-  let s:old_magic = &magic
-  set magic
-
-  if s:settings.use_xhtml
-    if s:settings.encoding != ""
-      let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
-    else
-      let xml_line = "<?xml version=\"1.0\"?>"
-    endif
-    let tag_close = ' />'
-  endif
-
-  let style = [s:settings.use_xhtml ? "" : '-->']
-  let body_line = ''
-
-  let html = []
-  if s:settings.use_xhtml
-    call add(html, xml_line)
-  endif
-  if s:settings.use_xhtml
-    call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
-    call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
-  elseif s:settings.use_css && !s:settings.no_pre
-    call add(html, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">")
-    call add(html, '<html>')
-  else
-    call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
-    call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
-    call add(html, '<html>')
-  endif
-  call add(html, '<head>')
-
-  " include encoding as close to the top as possible, but only if not already
-  " contained in XML information
-  if s:settings.encoding != "" && !s:settings.use_xhtml
-    call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
-  endif
-
-  call add(html, '<title>diff</title>')
-  call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
-  call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
-  call add(html, '<meta name="settings" content="'.
-	\ join(filter(keys(s:settings),'s:settings[v:val]'),',').
-	\ ',prevent_copy='.s:settings.prevent_copy.
-	\ '"'.tag_close)
-  call add(html, '<meta name="colorscheme" content="'.
-	\ (exists('g:colors_name')
-	\ ? g:colors_name
-	\ : 'none'). '"'.tag_close)
-
-  call add(html, '</head>')
-  let body_line_num = len(html)
-  if !empty(s:settings.prevent_copy)
-    call add(html, "<body onload='FixCharWidth();".(s:settings.line_ids ? " JumpToLine();" : "")."'>")
-    call add(html, "<!-- hidden divs used by javascript to get the width of a char -->")
-    call add(html, "<div id='oneCharWidth'>0</div>")
-    call add(html, "<div id='oneInputWidth'><input size='1' value='0'".tag_close."</div>")
-    call add(html, "<div id='oneEmWidth' style='width: 1em;'></div>")
-  else
-    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
-  endif
-  call add(html, "<table border='1' width='100%' id='vimCodeElement".s:settings.id_suffix."'>")
-
-  call add(html, '<tr>')
-  for buf in a:win_list
-    call add(html, '<th>'.bufname(buf).'</th>')
-  endfor
-  call add(html, '</tr><tr>')
-
-  let diff_style_start = 0
-  let insert_index = 0
-
-  for buf in a:buf_list
-    let temp = []
-    exe bufwinnr(buf) . 'wincmd w'
-
-    " If text is folded because of user foldmethod settings, etc. we don't want
-    " to act on everything in a fold by mistake.
-    setlocal nofoldenable
-
-    " When not using CSS or when using xhtml, the <body> line can be important.
-    " Assume it will be the same for all buffers and grab it from the first
-    " buffer. Similarly, need to grab the body end line as well.
-    if body_line == ''
-      1
-      call search('<body')
-      let body_line = getline('.')
-      $
-      call search('</body>', 'b')
-      let s:body_end_line = getline('.')
-    endif
-
-    " Grab the style information. Some of this will be duplicated so only insert
-    " it if it's not already there. {{{
-    1
-    let style_start = search('^<style type="text/css">')
-    1
-    let style_end = search('^</style>')
-    if style_start > 0 && style_end > 0
-      let buf_styles = getline(style_start + 1, style_end - 1)
-      for a_style in buf_styles
-	if index(style, a_style) == -1
-	  if diff_style_start == 0
-	    if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
-	      let diff_style_start = len(style)-1
-	    endif
-	  endif
-	  call insert(style, a_style, insert_index)
-	  let insert_index += 1
-	endif
-      endfor
-    endif " }}}
-
-    " everything new will get added before the diff styles so diff highlight
-    " properly overrides normal highlight
-    if diff_style_start != 0
-      let insert_index = diff_style_start
-    endif
-
-    " Delete those parts that are not needed so we can include the rest into the
-    " resulting table.
-    1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
-    $
-    ?</body>?,$d_
-    let temp = getline(1,'$')
-    " clean out id on the main content container because we already set it on
-    " the table
-    let temp[0] = substitute(temp[0], " id='vimCodeElement[^']*'", "", "")
-    " undo deletion of start and end part
-    " so we can later save the file as valid html
-    " TODO: restore using grabbed lines if undolevel is 1?
-    normal! 2u
-    if s:settings.use_css
-      call add(html, '<td valign="top"><div>')
-    elseif s:settings.use_xhtml
-      call add(html, '<td nowrap="nowrap" valign="top"><div>')
-    else
-      call add(html, '<td nowrap valign="top"><div>')
-    endif
-    let html += temp
-    call add(html, '</div></td>')
-
-    " Close this buffer
-    " TODO: the comment above says we're going to allow saving the file
-    " later...but here we discard it?
-    quit!
-  endfor
-
-  let html[body_line_num] = body_line
-
-  call add(html, '</tr>')
-  call add(html, '</table>')
-  call add(html, s:body_end_line)
-  call add(html, '</html>')
-
-  " The generated HTML is admittedly ugly and takes a LONG time to fold.
-  " Make sure the user doesn't do syntax folding when loading a generated file,
-  " using a modeline.
-  call add(html, '<!-- vim: set foldmethod=manual : -->')
-
-  let i = 1
-  let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
-  " Find an unused file name if current file name is already in use
-  while filereadable(name)
-    let name = substitute(name, '\d*\.x\?html$', '', '') . i . '.' . fnamemodify(copy(name), ":t:e")
-    let i += 1
-  endwhile
-  exe "topleft new " . name
-  setlocal modifiable
-
-  " just in case some user autocmd creates content in the new buffer, make sure
-  " it is empty before proceeding
-  %d
-
-  " set the fileencoding to match the charset we'll be using
-  let &l:fileencoding=s:settings.vim_encoding
-
-  " According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte
-  " order mark is highly recommend on the web when using multibyte encodings. But,
-  " it is not a good idea to include it on UTF-8 files. Otherwise, let Vim
-  " determine when it is actually inserted.
-  if s:settings.vim_encoding == 'utf-8'
-    setlocal nobomb
-  else
-    setlocal bomb
-  endif
-
-  call append(0, html)
-
-  if len(style) > 0
-    1
-    let style_start = search('^</head>')-1
-
-    " add required javascript in reverse order so we can just call append again
-    " and again without adjusting {{{
-
-    " insert script closing tag
-    call append(style_start, [
-	  \ '',
-	  \ s:settings.use_xhtml ? '//]]>' : '-->',
-	  \ "</script>"
-	  \ ])
-
-    " insert script which corrects the size of small input elements in
-    " prevent_copy mode. See 2html.vim for details on why this is needed and how
-    " it works.
-    if !empty(s:settings.prevent_copy)
-      call append(style_start, [
-	    \ '',
-	    \ '/* simulate a "ch" unit by asking the browser how big a zero character is */',
-	    \ 'function FixCharWidth() {',
-	    \ '  /* get the hidden element which gives the width of a single character */',
-	    \ '  var goodWidth = document.getElementById("oneCharWidth").clientWidth;',
-	    \ '  /* get all input elements, we''ll filter on class later */',
-	    \ '  var inputTags = document.getElementsByTagName("input");',
-	    \ '  var ratio = 5;',
-	    \ '  var inputWidth = document.getElementById("oneInputWidth").clientWidth;',
-	    \ '  var emWidth = document.getElementById("oneEmWidth").clientWidth;',
-	    \ '  if (inputWidth > goodWidth) {',
-	    \ '    while (ratio < 100*goodWidth/emWidth && ratio < 100) {',
-	    \ '      ratio += 5;',
-	    \ '    }',
-	    \ '    document.getElementById("vimCodeElement'.s:settings.id_suffix.'").className = "em"+ratio;',
-	    \ '  }',
-	    \ '}'
-	    \ ])
-    endif
-    "
-    " insert javascript to get IDs from line numbers, and to open a fold before
-    " jumping to any lines contained therein
-    call append(style_start, [
-	  \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
-	  \ "   * we corrected the raw number to a line ID.",
-	  \ "   */",
-	  \ "  if (lineElem) {",
-	  \ "    lineElem.scrollIntoView(true);",
-	  \ "  }",
-	  \ "  return true;",
-	  \ "}",
-	  \ "if ('onhashchange' in window) {",
-	  \ "  window.onhashchange = JumpToLine;",
-	  \ "}"
-	  \ ])
-    if s:settings.dynamic_folds
-      call append(style_start, [
-	    \ "",
-	    \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
-	    \ "  var node = lineElem;",
-	    \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
-	    \ "  {",
-	    \ "    if (node.className == 'closed-fold')",
-	    \ "    {",
-	    \ "      /* toggle open the fold ID (remove window ID) */",
-	    \ "      toggleFold(node.id.substr(4));",
-	    \ "    }",
-	    \ "    node = node.parentNode;",
-	    \ "  }",
-	    \ ])
-    endif
-    call append(style_start, [
-	  \ "",
-	  \ "/* function to open any folds containing a jumped-to line before jumping to it */",
-	  \ "function JumpToLine()",
-	  \ "{",
-	  \ "  var lineNum;",
-	  \ "  lineNum = window.location.hash;",
-	  \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
-	  \ "",
-	  \ "  if (lineNum.indexOf('L') == -1) {",
-	  \ "    lineNum = 'L'+lineNum;",
-	  \ "  }",
-	  \ "  if (lineNum.indexOf('W') == -1) {",
-	  \ "    lineNum = 'W1'+lineNum;",
-	  \ "  }",
-	  \ "  lineElem = document.getElementById(lineNum);"
-	  \ ])
-
-    " Insert javascript to toggle matching folds open and closed in all windows,
-    " if dynamic folding is active.
-    if s:settings.dynamic_folds
-      call append(style_start, [
-	    \  "  function toggleFold(objID)",
-	    \  "  {",
-	    \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
-	    \  "    {",
-	    \  "      var fold;",
-	    \  '      fold = document.getElementById("win"+win_num+objID);',
-	    \  "      if(fold.className == 'closed-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'open-fold';",
-	    \  "      }",
-	    \  "      else if (fold.className == 'open-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'closed-fold';",
-	    \  "      }",
-	    \  "    }",
-	    \  "  }",
-	    \ ])
-    endif
-
-    " insert script tag; javascript is always needed for the line number
-    " normalization for URL hashes
-    call append(style_start, [
-	  \ "<script type='text/javascript'>",
-	  \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
-
-    " Insert styles from all the generated html documents and additional styles
-    " for the table-based layout of the side-by-side diff. The diff should take
-    " up the full browser window (but not more), and be static in size,
-    " horizontally scrollable when the lines are too long. Otherwise, the diff
-    " is pretty useless for really long lines. {{{
-    if s:settings.use_css
-      call append(style_start,
-	    \ ['<style type="text/css">']+
-	    \ style+
-	    \ [ s:settings.use_xhtml ? '' : '<!--',
-	    \   'table { table-layout: fixed; }',
-	    \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
-	    \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
-	    \   'td div { overflow: auto; }',
-	    \   s:settings.use_xhtml ? '' : '-->',
-	    \   '</style>'
-	    \])
-    endif "}}}
-  endif
-
-  let &paste = s:old_paste
-  let &magic = s:old_magic
-endfunc "}}}
-
-" Gets a single user option and sets it in the passed-in Dict, or gives it the
-" default value if the option doesn't actually exist.
-func! tohtml#GetOption(settings, option, default) "{{{
-  if exists('g:html_'.a:option)
-    let a:settings[a:option] = g:html_{a:option}
-  else
-    let a:settings[a:option] = a:default
-  endif
-endfunc "}}}
-
-" returns a Dict containing the values of all user options for 2html, including
-" default values for those not given an explicit value by the user. Discards the
-" html_ prefix of the option for nicer looking code.
-func! tohtml#GetUserSettings() "{{{
-  if exists('s:settings')
-    " just restore the known options if we've already retrieved them
-    return s:settings
-  else
-    " otherwise figure out which options are set
-    let user_settings = {}
-
-    " Define the correct option if the old option name exists and we haven't
-    " already defined the correct one. Maybe I'll put out a warnig message about
-    " this sometime and remove the old option entirely at some even later time,
-    " but for now just silently accept the old option.
-    if exists('g:use_xhtml') && !exists("g:html_use_xhtml")
-      let g:html_use_xhtml = g:use_xhtml
-    endif
-
-    " get current option settings with appropriate defaults {{{
-    call tohtml#GetOption(user_settings,    'no_progress', !has("statusline") )
-    call tohtml#GetOption(user_settings,  'diff_one_file', 0 )
-    call tohtml#GetOption(user_settings,   'number_lines', &number )
-    call tohtml#GetOption(user_settings,       'pre_wrap', &wrap )
-    call tohtml#GetOption(user_settings,        'use_css', 1 )
-    call tohtml#GetOption(user_settings, 'ignore_conceal', 0 )
-    call tohtml#GetOption(user_settings, 'ignore_folding', 0 )
-    call tohtml#GetOption(user_settings,  'dynamic_folds', 0 )
-    call tohtml#GetOption(user_settings,  'no_foldcolumn', user_settings.ignore_folding)
-    call tohtml#GetOption(user_settings,   'hover_unfold', 0 )
-    call tohtml#GetOption(user_settings,         'no_pre', 0 )
-    call tohtml#GetOption(user_settings,     'no_invalid', 0 )
-    call tohtml#GetOption(user_settings,   'whole_filler', 0 )
-    call tohtml#GetOption(user_settings,      'use_xhtml', 0 )
-    call tohtml#GetOption(user_settings,       'line_ids', user_settings.number_lines )
-    " }}}
-    
-    " override those settings that need it {{{
-
-    " hover opening implies dynamic folding
-    if user_settings.hover_unfold
-      let user_settings.dynamic_folds = 1
-    endif
-
-    " ignore folding overrides dynamic folding
-    if user_settings.ignore_folding && user_settings.dynamic_folds
-      let user_settings.dynamic_folds = 0
-      let user_settings.hover_unfold = 0
-    endif
-
-    " dynamic folding with no foldcolumn implies hover opens
-    if user_settings.dynamic_folds && user_settings.no_foldcolumn
-      let user_settings.hover_unfold = 1
-    endif
-
-    " dynamic folding implies css
-    if user_settings.dynamic_folds
-      let user_settings.use_css = 1
-    else
-      let user_settings.no_foldcolumn = 1 " won't do anything but for consistency and for the test suite
-    endif
-
-    " if we're not using CSS we cannot use a pre section because <font> tags
-    " aren't allowed inside a <pre> block
-    if !user_settings.use_css
-      let user_settings.no_pre = 1
-    endif
-
-    " pre_wrap doesn't do anything if not using pre or not using CSS
-    if user_settings.no_pre || !user_settings.use_css
-      let user_settings.pre_wrap=0
-    endif
-    "}}}
-
-    " set up expand_tabs option after all the overrides so we know the
-    " appropriate defaults {{{
-    if user_settings.no_pre == 0
-      call tohtml#GetOption(user_settings,
-	    \ 'expand_tabs',
-	    \ &expandtab || &ts != 8 || user_settings.number_lines ||
-	    \   (user_settings.dynamic_folds && !user_settings.no_foldcolumn))
-    else
-      let user_settings.expand_tabs = 1
-    endif
-    " }}}
-
-    " textual options
-    if exists("g:html_use_encoding") "{{{
-      " user specified the desired MIME charset, figure out proper
-      " 'fileencoding' from it or warn the user if we cannot
-      let user_settings.encoding = g:html_use_encoding
-      let user_settings.vim_encoding = tohtml#EncodingFromCharset(g:html_use_encoding)
-      if user_settings.vim_encoding == ''
-	echohl WarningMsg
-	echomsg "TOhtml: file encoding for"
-	      \ g:html_use_encoding
-	      \ "unknown, please set 'fileencoding'"
-	echohl None
-      endif
-    else
-      " Figure out proper MIME charset from 'fileencoding' if possible
-      if &l:fileencoding != '' 
-	" If the buffer is not a "normal" type, the 'fileencoding' value may not
-	" be trusted; since the buffer should not be written the fileencoding is
-	" not intended to be used.
-	if &l:buftype=='' || &l:buftype==?'help'
-	  let user_settings.vim_encoding = &l:fileencoding
-	  call tohtml#CharsetFromEncoding(user_settings)
-	else
-	  let user_settings.encoding = '' " trigger detection using &encoding
-	endif
-      endif
-
-      " else from 'encoding' if possible
-      if &l:fileencoding == '' || user_settings.encoding == ''
-	let user_settings.vim_encoding = &encoding
-	call tohtml#CharsetFromEncoding(user_settings)
-      endif
-
-      " else default to UTF-8 and warn user
-      if user_settings.encoding == ''
-	let user_settings.vim_encoding = 'utf-8'
-	let user_settings.encoding = 'UTF-8'
-	echohl WarningMsg
-	echomsg "TOhtml: couldn't determine MIME charset, using UTF-8"
-	echohl None
-      endif
-    endif "}}}
-
-    " Default to making nothing uncopyable, because we default to
-    " not-standards way of doing things, and also because Microsoft Word and
-    " others paste the <input> elements anyway.
-    "
-    " html_prevent_copy only has an effect when using CSS.
-    "
-    " All options:
-    "	  f - fold column
-    "	  n - line numbers (also within fold text)
-    "	  t - fold text
-    "	  d - diff filler
-    "	  c - concealed text (reserved future)
-    "	  l - listchars (reserved possible future)
-    "	  s - signs (reserved possible future)
-    "
-    " Normal text is always selectable.
-    let user_settings.prevent_copy = ""
-    if user_settings.use_css
-      if exists("g:html_prevent_copy")
-	if user_settings.dynamic_folds && !user_settings.no_foldcolumn && g:html_prevent_copy =~# 'f'
-	  let user_settings.prevent_copy .= 'f'
-	endif
-	if user_settings.number_lines && g:html_prevent_copy =~# 'n'
-	  let user_settings.prevent_copy .= 'n'
-	endif
-	if &diff && g:html_prevent_copy =~# 'd'
-	  let user_settings.prevent_copy .= 'd'
-	endif
-	if !user_settings.ignore_folding && g:html_prevent_copy =~# 't'
-	  let user_settings.prevent_copy .= 't'
-	endif
-      else
-	let user_settings.prevent_copy = ""
-      endif
-    endif
-    if empty(user_settings.prevent_copy)
-      let user_settings.no_invalid = 0
-    endif
-
-    if exists('g:html_id_expr')
-      let user_settings.id_suffix = eval(g:html_id_expr)
-      if user_settings.id_suffix !~ '^[-_:.A-Za-z0-9]*$'
-	echohl WarningMsg
-	echomsg '2html: g:html_id_expr evaluated to invalid string for HTML id attributes'
-	echomsg '2html: Omitting user-specified suffix'
-	echohl None
-	sleep 3
-	let user_settings.id_suffix=""
-      endif
-    else
-      let user_settings.id_suffix=""
-    endif
-
-    " TODO: font
-
-    return user_settings
-  endif
-endfunc "}}}
-
-" get the proper HTML charset name from a Vim encoding option.
-function! tohtml#CharsetFromEncoding(settings) "{{{
-  let l:vim_encoding = a:settings.vim_encoding
-  if exists('g:html_charset_override') && has_key(g:html_charset_override, l:vim_encoding)
-    let a:settings.encoding = g:html_charset_override[l:vim_encoding]
-  else
-    if l:vim_encoding =~ '^8bit\|^2byte'
-      " 8bit- and 2byte- prefixes are to indicate encodings available on the
-      " system that Vim will convert with iconv(), look up just the encoding name,
-      " not Vim's prefix.
-      let l:vim_encoding = substitute(l:vim_encoding, '^8bit-\|^2byte-', '', '')
-    endif
-    if has_key(g:tohtml#encoding_to_charset, l:vim_encoding)
-      let a:settings.encoding = g:tohtml#encoding_to_charset[l:vim_encoding]
-    else
-      let a:settings.encoding = ""
-    endif
-  endif
-  if a:settings.encoding != ""
-    let l:vim_encoding = tohtml#EncodingFromCharset(a:settings.encoding)
-    if l:vim_encoding != ""
-      " if the Vim encoding to HTML encoding conversion is set up (by default or
-      " by the user) to convert to a different encoding, we need to also change
-      " the Vim encoding of the new buffer
-      let a:settings.vim_encoding = l:vim_encoding
-    endif
-  endif
-endfun "}}}
-
-" Get the proper Vim encoding option setting from an HTML charset name.
-function! tohtml#EncodingFromCharset(encoding) "{{{
-  if exists('g:html_encoding_override') && has_key(g:html_encoding_override, a:encoding)
-    return g:html_encoding_override[a:encoding]
-  elseif has_key(g:tohtml#charset_to_encoding, tolower(a:encoding))
-    return g:tohtml#charset_to_encoding[tolower(a:encoding)]
-  else
-    return ""
-  endif
-endfun "}}}
-
-let &cpo = s:cpo_sav
-unlet s:cpo_sav
-
-" Make sure any patches will probably use consistent indent
-"   vim: ts=8 sw=2 sts=2 noet fdm=marker
@@ -1,9 +1,9 @@
 " vimball.vim : construct a file containing both paths and files
 " Author:	Charles E. Campbell, Jr.
-" Date:		Jan 17, 2012
-" Version:	35
+" Date:		May 07, 2007
+" Version:	22
 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
-" Copyright: (c) 2004-2011 by Charles E. Campbell, Jr.
+" Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.
 "            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
 "            (see |copyright|) except use "Vimball" instead of "Vim".
 "            No warranty, express or implied.
@@ -11,19 +11,12 @@

 " ---------------------------------------------------------------------
 "  Load Once: {{{1
-if &cp || exists("g:loaded_vimball")
+if &cp || exists("g:loaded_vimball") || v:version < 700
 finish
 endif
-let g:loaded_vimball = "v35"
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of vimball needs vim 7.2"
- echohl Normal
- finish
-endif
-let s:keepcpo= &cpo
+let s:keepcpo        = &cpo
+let g:loaded_vimball = "v22"
 set cpo&vim
-"DechoTabOn

 " =====================================================================
 " Constants: {{{1
@@ -31,33 +24,6 @@ if !exists("s:USAGE")
 let s:USAGE   = 0
 let s:WARNING = 1
 let s:ERROR   = 2
-
- " determine if cygwin is in use or not
- if !exists("g:netrw_cygwin")
-  if has("win32") || has("win95") || has("win64") || has("win16")
-   if &shell =~ '\%(\<bash\>\|\<zsh\>\)\%(\.exe\)\=$'
-    let g:netrw_cygwin= 1
-   else
-    let g:netrw_cygwin= 0
-   endif
-  else
-   let g:netrw_cygwin= 0
-  endif
- endif
-
- " set up g:vimball_mkdir if the mkdir() call isn't defined
- if !exists("*mkdir")
-  if exists("g:netrw_local_mkdir")
-   let g:vimball_mkdir= g:netrw_local_mkdir
-  elseif executable("mkdir")
-   let g:vimball_mkdir= "mkdir"
-  elseif executable("makedir")
-   let g:vimball_mkdir= "makedir"
-  endif
-  if !exists(g:vimball_mkdir)
-   call vimball#ShowMesg(s:WARNING,"(vimball) g:vimball_mkdir undefined")
-  endif
- endif
 endif

 " =====================================================================
@@ -65,12 +31,7 @@ endif

 " ---------------------------------------------------------------------
 " vimball#MkVimball: creates a vimball given a list of paths to files {{{2
-" Input:
-"     line1,line2: a range of lines containing paths to files to be included in the vimball
-"     writelevel : if true, force a write to filename.vmb, even if it exists
-"                  (usually accomplished with :MkVimball! ...
-"     filename   : base name of file to be created (ie. filename.vmb)
-" Output: a filename.vmb using vimball format:
+" Vimball Format:
 "     path
 "     filesize
 "     [file]
@@ -79,17 +40,17 @@ endif
 "     [file]
 fun! vimball#MkVimball(line1,line2,writelevel,...) range
 "  call Dfunc("MkVimball(line1=".a:line1." line2=".a:line2." writelevel=".a:writelevel." vimballname<".a:1.">) a:0=".a:0)
-  if a:1 =~ '\.vim$' || a:1 =~ '\.txt$'
-   let vbname= substitute(a:1,'\.\a\{3}$','.vmb','')
+  if a:1 =~ '.vim' || a:1 =~ '.txt'
+   let vbname= substitute(a:1,'\.\a\{3}$','.vba','')
  else
   let vbname= a:1
  endif
-  if vbname !~ '\.vmb$'
-   let vbname= vbname.'.vmb'
+  if vbname !~ '\.vba$'
+   let vbname= vbname.'.vba'
  endif
 "  call Decho("vbname<".vbname.">")
-  if !a:writelevel && a:1 =~ '[\/]'
-   call vimball#ShowMesg(s:ERROR,"(MkVimball) vimball name<".a:1."> should not include slashes; use ! to insist")
+  if a:1 =~ '[\/]'
+   call vimball#ShowMesg(s:ERROR,"(MkVimball) vimball name<".a:1."> should not include slashes")
 "   call Dret("MkVimball : vimball name<".a:1."> should not include slashes")
   return
  endif
@@ -100,14 +61,14 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
  endif

  " user option bypass
-  call vimball#SaveSettings()
+  call s:SaveSettings()

  if a:0 >= 2
   " allow user to specify where to get the files
   let home= expand(a:2)
  else
   " use first existing directory from rtp
-   let home= vimball#VimballHome()
+   let home= s:VimballHome()
  endif

  " save current directory
@@ -126,7 +87,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
   if !filereadable(svfile)
    call vimball#ShowMesg(s:ERROR,"unable to read file<".svfile.">")
 	call s:ChgDir(curdir)
-	call vimball#RestoreSettings()
+	call s:RestoreSettings()
 "    call Dret("MkVimball")
    return
   endif
@@ -134,7 +95,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
   " create/switch to mkvimball tab
   if !exists("vbtabnr")
    tabnew
-    sil! file Vimball
+    silent! file Vimball
    let vbtabnr= tabpagenr()
   else
    exe "tabn ".vbtabnr
@@ -151,8 +112,9 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
   call setline(lastline+1,0)

   " write the file from the tab
-"   call Decho("exe $r ".fnameescape(svfile))
-   exe "$r ".fnameescape(svfile)
+   let svfilepath= s:Path(svfile,'')
+"   call Decho("exe $r ".svfilepath)
+   exe "$r ".svfilepath

   call setline(lastline+1,line("$") - lastline - 1)
 "   call Decho("lastline=".lastline." line$=".line("$"))
@@ -165,13 +127,14 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
  " write the vimball
  exe "tabn ".vbtabnr
  call s:ChgDir(curdir)
-  setlocal ff=unix
  if a:writelevel
-"   call Decho("exe w! ".fnameescape(vbname))
-   exe "w! ".fnameescape(vbname)
+   let vbnamepath= s:Path(vbname,'')
+"   call Decho("exe w! ".vbnamepath)
+   exe "w! ".vbnamepath
  else
-"   call Decho("exe w ".fnameescape(vbname))
-   exe "w ".fnameescape(vbname)
+   let vbnamepath= s:Path(vbname,'')
+"   call Decho("exe w ".vbnamepath)
+   exe "w ".vbnamepath
  endif
 "  call Decho("Vimball<".vbname."> created")
  echo "Vimball<".vbname."> created"
@@ -182,56 +145,38 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
  exe "tabc ".vbtabnr

  " restore options
-  call vimball#RestoreSettings()
+  call s:RestoreSettings()

 "  call Dret("MkVimball")
 endfun

 " ---------------------------------------------------------------------
 " vimball#Vimball: extract and distribute contents from a vimball {{{2
-"                  (invoked the the UseVimball command embedded in 
-"                  vimballs' prologue)
 fun! vimball#Vimball(really,...)
 "  call Dfunc("vimball#Vimball(really=".a:really.") a:0=".a:0)

-  if v:version < 701 || (v:version == 701 && !exists('*fnameescape'))
-   echoerr "your vim is missing the fnameescape() function (pls upgrade to vim 7.2 or later)"
-"   call Dret("vimball#Vimball : needs 7.1 with patch 299 or later")
-   return
-  endif
-
-  if getline(1) !~ '^" Vimball Archiver'
+  if getline(1) !~ '^" Vimball Archiver by Charles E. Campbell, Jr., Ph.D.$'
   echoerr "(Vimball) The current file does not appear to be a Vimball!"
 "   call Dret("vimball#Vimball")
   return
  endif

  " set up standard settings
-  call vimball#SaveSettings()
-  let curtabnr    = tabpagenr()
-  let vimballfile = expand("%:tr")
+  call s:SaveSettings()
+  let curtabnr = tabpagenr()

  " set up vimball tab
 "  call Decho("setting up vimball tab")
  tabnew
-  sil! file Vimball
+  silent! file Vimball
  let vbtabnr= tabpagenr()
  let didhelp= ""

  " go to vim plugin home
  if a:0 > 0
-   " let user specify the directory where the vimball is to be unpacked.
-   " If, however, the user did not specify a full path, set the home to be below the current directory
   let home= expand(a:1)
-   if has("win32") || has("win95") || has("win64") || has("win16")
-	if home !~ '^\a:[/\\]'
-	 let home= getcwd().'/'.a:1
-	endif
-   elseif home !~ '^/'
-	let home= getcwd().'/'.a:1
-   endif
  else
-   let home= vimball#VimballHome()
+   let home= s:VimballHome()
  endif
 "  call Decho("home<".home.">")

@@ -241,18 +186,16 @@ fun! vimball#Vimball(really,...)
 "  call Decho("curdir<".curdir.">")

  call s:ChgDir(home)
-  let s:ok_unablefind= 1
-  call vimball#RmVimball(vimballfile)
-  unlet s:ok_unablefind
+  call vimball#RmVimball()

  let linenr  = 4
  let filecnt = 0

  " give title to listing of (extracted) files from Vimball Archive
  if a:really
-   echohl Title     | echomsg "Vimball Archive"         | echohl None
-  else             
-   echohl Title     | echomsg "Vimball Archive Listing" | echohl None
+   echohl Title | echomsg "Vimball Archive" | echohl None
+  else
+   echohl Title | echomsg "Vimball Archive Listing" | echohl None
   echohl Statement | echomsg "files would be placed under: ".home | echohl None
  endif

@@ -263,10 +206,9 @@ fun! vimball#Vimball(really,...)
  while 1 < linenr && linenr < line("$")
   let fname   = substitute(getline(linenr),'\t\[\[\[1$','','')
   let fname   = substitute(fname,'\\','/','g')
-   let fsize   = substitute(getline(linenr+1),'^\(\d\+\).\{-}$','\1','')+0
-   let fenc    = substitute(getline(linenr+1),'^\d\+\s*\(\S\{-}\)$','\1','')
+   let fsize   = getline(linenr+1)
   let filecnt = filecnt + 1
-"   call Decho("fname<".fname."> fsize=".fsize." filecnt=".filecnt. " fenc=".fenc)
+"   call Decho("fname<".fname."> fsize=".fsize." filecnt=".filecnt)

   if a:really
    echomsg "extracted <".fname.">: ".fsize." lines"
@@ -277,10 +219,10 @@ fun! vimball#Vimball(really,...)
 "   call Decho("using L#".(linenr+1).": fsize=".fsize)

   " Allow AsNeeded/ directory to take place of plugin/ directory
-   " when AsNeeded/filename is filereadable or was present in VimballRecord
+   " when AsNeeded/filename is filereadable
   if fname =~ '\<plugin/'
   	let anfname= substitute(fname,'\<plugin/','AsNeeded/','')
-	if filereadable(anfname) || (exists("s:VBRstring") && s:VBRstring =~ anfname)
+	if filereadable(anfname)
 "	 call Decho("using anfname<".anfname."> instead of <".fname.">")
 	 let fname= anfname
 	endif
@@ -291,21 +233,14 @@ fun! vimball#Vimball(really,...)
 "    call Decho("making directories if they don't exist yet (fname<".fname.">)")
    let fnamebuf= substitute(fname,'\\','/','g')
 	let dirpath = substitute(home,'\\','/','g')
-"	call Decho("init: fnamebuf<".fnamebuf.">")
-"	call Decho("init: dirpath <".dirpath.">")
    while fnamebuf =~ '/'
     let dirname  = dirpath."/".substitute(fnamebuf,'/.*$','','')
 	 let dirpath  = dirname
     let fnamebuf = substitute(fnamebuf,'^.\{-}/\(.*\)$','\1','')
 "	 call Decho("dirname<".dirname.">")
-"	 call Decho("dirpath<".dirpath.">")
     if !isdirectory(dirname)
 "      call Decho("making <".dirname.">")
-      if exists("g:vimball_mkdir")
-	   call system(g:vimball_mkdir." ".shellescape(dirname))
-      else
-       call mkdir(dirname)
-      endif
+      call mkdir(dirname)
 	  call s:RecordInVar(home,"rmdir('".dirname."')")
     endif
    endwhile
@@ -317,55 +252,48 @@ fun! vimball#Vimball(really,...)
   let linenr   = linenr + 2
   let lastline = linenr + fsize - 1
 "   call Decho("exe ".linenr.",".lastline."yank a")
-   " no point in handling a zero-length file
-   if lastline >= linenr
-    exe "silent ".linenr.",".lastline."yank a"
+   exe "silent ".linenr.",".lastline."yank a"

-    " copy "a" buffer into tab
+   " copy "a" buffer into tab
 "   call Decho('copy "a buffer into tab#'.vbtabnr)
-    exe "tabn ".vbtabnr
-    setlocal ma
-    sil! %d
-    silent put a
-    1
-    sil! d
+   exe "tabn ".vbtabnr
+   silent! %d
+   silent put a
+   1
+   silent d

-    " write tab to file
-    if a:really
-     let fnamepath= home."/".fname
-"    call Decho("exe w! ".fnameescape(fnamepath))
-	if fenc != ""
-	 exe "silent w! ++enc=".fnameescape(fenc)." ".fnameescape(fnamepath)
-	else
-	 exe "silent w! ".fnameescape(fnamepath)
-	endif
-	echo "wrote ".fnameescape(fnamepath)
+   " write tab to file
+   if a:really
+    let fnamepath= s:Path(home."/".fname,'')
+"    call Decho("exe w! ".fnamepath)
+    exe "silent w! ".fnamepath
+    echo "wrote ".fnamepath
 	call s:RecordInVar(home,"call delete('".fnamepath."')")
-    endif
+   endif

-    " return to tab with vimball
+   " return to tab with vimball
 "   call Decho("exe tabn ".curtabnr)
-    exe "tabn ".curtabnr
+   exe "tabn ".curtabnr

-    " set up help if its a doc/*.txt file
+   " set up help if its a doc/*.txt file
 "   call Decho("didhelp<".didhelp."> fname<".fname.">")
-    if a:really && didhelp == "" && fname =~ 'doc/[^/]\+\.\(txt\|..x\)$'
-    	let didhelp= substitute(fname,'^\(.*\<doc\)[/\\][^.]*\.\(txt\|..x\)$','\1','')
+   if a:really && didhelp == "" && fname =~ 'doc/[^/]\+\.txt$'
+   	let didhelp= substitute(fname,'^\(.*\<doc\)[/\\][^.]*\.txt$','\1','')
 "	call Decho("didhelp<".didhelp.">")
-    endif
   endif

   " update for next file
-"   call Decho("update linenr= [linenr=".linenr."] + [fsize=".fsize."] = ".(linenr+fsize))
-   let linenr= linenr + fsize
+"   let oldlinenr = linenr " Decho
+   let linenr    = linenr + fsize
+"   call Decho("update linenr= [linenr=".oldlinenr."] + [fsize=".fsize."] = ".linenr)
  endwhile

  " set up help
 "  call Decho("about to set up help: didhelp<".didhelp.">")
  if didhelp != ""
-   let htpath= home."/".didhelp
+   let htpath= escape(substitute(s:Path(home."/".didhelp,'"'),'"','','g'),' ')
 "   call Decho("exe helptags ".htpath)
-   exe "helptags ".fnameescape(htpath)
+   exe "helptags ".htpath
   echo "did helptags"
  endif

@@ -383,7 +311,7 @@ fun! vimball#Vimball(really,...)
  setlocal nomod bh=wipe
  exe "tabn ".curtabnr
  exe "tabc ".vbtabnr
-  call vimball#RestoreSettings()
+  call s:RestoreSettings()
  call s:ChgDir(curdir)

 "  call Dret("vimball#Vimball")
@@ -401,10 +329,12 @@ fun! vimball#RmVimball(...)
 "   call Dret("vimball#RmVimball : (g:vimball_norecord)")
   return
  endif
+  let eikeep= &ei
+  set ei=all
+"  call Decho("turned off all events")

  if a:0 == 0
-   let curfile= expand("%:tr")
-"   call Decho("case a:0=0: curfile<".curfile."> (used expand(%:tr))")
+   let curfile= '^'.expand("%:tr")
  else
   if a:1 =~ '[\/]'
    call vimball#ShowMesg(s:USAGE,"RmVimball vimballname [path]")
@@ -412,17 +342,16 @@ fun! vimball#RmVimball(...)
    return
   endif
   let curfile= a:1
-"   call Decho("case a:0=".a:0.": curfile<".curfile.">")
  endif
-  if curfile =~ '\.vmb$'
-   let curfile= substitute(curfile,'\.vmb','','')
-  elseif curfile =~ '\.vba$'
-   let curfile= substitute(curfile,'\.vba','','')
+  if curfile !~ '.vba$'
+   let curfile= curfile.".vba: "
+  else
+   let curfile= curfile.": "
  endif
  if a:0 >= 2
   let home= expand(a:2)
  else
-   let home= vimball#VimballHome()
+   let home= s:VimballHome()
  endif
  let curdir = getcwd()
 "  call Decho("home   <".home.">")
@@ -434,113 +363,52 @@ fun! vimball#RmVimball(...)
 "   call Decho(".VimballRecord is readable")
 "   call Decho("curfile<".curfile.">")
   keepalt keepjumps 1split 
-   sil! keepalt keepjumps e .VimballRecord
+   silent! keepalt keepjumps e .VimballRecord
   let keepsrch= @/
-"   call Decho('search for ^\M'.curfile.'.\m: ')
-"   call Decho('search for ^\M'.curfile.'.\m{vba|vmb}: ')
-"   call Decho('search for ^\M'.curfile.'\m[-0-9.]*\.{vba|vmb}: ')
-   if search('^\M'.curfile."\m: ".'cw')
-	let foundit= 1
-   elseif search('^\M'.curfile.".\mvmb: ",'cw')
-	let foundit= 2
-   elseif search('^\M'.curfile.'\m[-0-9.]*\.vmb: ','cw')
-	let foundit= 2
-   elseif search('^\M'.curfile.".\mvba: ",'cw')
-	let foundit= 1
-   elseif search('^\M'.curfile.'\m[-0-9.]*\.vba: ','cw')
-	let foundit= 1
-   else
-    let foundit = 0
-   endif
-   if foundit
-	if foundit == 1
-	 let exestring  = substitute(getline("."),'^\M'.curfile.'\m\S\{-}\.vba: ','','')
-	else
-	 let exestring  = substitute(getline("."),'^\M'.curfile.'\m\S\{-}\.vmb: ','','')
-	endif
-    let s:VBRstring= substitute(exestring,'call delete(','','g')
-    let s:VBRstring= substitute(s:VBRstring,"[')]",'','g')
+   if search(curfile,'cw')
+   	let exestring= substitute(getline("."),curfile,'','')
 "	call Decho("exe ".exestring)
-	sil! keepalt keepjumps exe exestring
-	sil! keepalt keepjumps d
-	let exestring= strlen(substitute(exestring,'call delete(.\{-})|\=',"D","g"))
-"	call Decho("exestring<".exestring.">")
-	echomsg "removed ".exestring." files"
+	silent! keepalt keepjumps exe exestring
+	silent! keepalt keepjumps d
   else
-    let s:VBRstring= ''
-	let curfile    = substitute(curfile,'\.vmb','','')
-"    call Decho("unable to find <".curfile."> in .VimballRecord")
-	if !exists("s:ok_unablefind")
-     call vimball#ShowMesg(s:WARNING,"(RmVimball) unable to find <".curfile."> in .VimballRecord")
-	endif
+"   	call Decho("unable to find <".curfile."> in .VimballRecord")
   endif
-   sil! keepalt keepjumps g/^\s*$/d
-   sil! keepalt keepjumps wq!
+   silent! keepalt keepjumps g/^\s*$/d
+   silent! keepalt keepjumps wq!
   let @/= keepsrch
  endif
  call s:ChgDir(curdir)

+  " restoring events
+"  call Decho("restoring events")
+  let &ei= eikeep
+
 "  call Dret("vimball#RmVimball")
 endfun

 " ---------------------------------------------------------------------
 " vimball#Decompress: attempts to automatically decompress vimballs {{{2
-fun! vimball#Decompress(fname,...)
-"  call Dfunc("Decompress(fname<".a:fname.">) a:0=".a:0)
+fun! vimball#Decompress(fname)
+"  call Dfunc("Decompress(fname<".a:fname.">)")

  " decompression:
  if     expand("%") =~ '.*\.gz'  && executable("gunzip")
-   " handle *.gz with gunzip
-   silent exe "!gunzip ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) gunzip may have failed with <".a:fname.">")
-   endif
+   exe "!gunzip ".a:fname
   let fname= substitute(a:fname,'\.gz$','','')
   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
-  elseif expand("%") =~ '.*\.gz' && executable("gzip")
-   " handle *.gz with gzip -d
-   silent exe "!gzip -d ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "gzip -d" may have failed with <'.a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.gz$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
+   call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)")
  elseif expand("%") =~ '.*\.bz2' && executable("bunzip2")
-   " handle *.bz2 with bunzip2
-   silent exe "!bunzip2 ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) bunzip2 may have failed with <".a:fname.">")
-   endif
+   exe "!bunzip2 ".a:fname
   let fname= substitute(a:fname,'\.bz2$','','')
   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
-  elseif expand("%") =~ '.*\.bz2' && executable("bzip2")
-   " handle *.bz2 with bzip2 -d
-   silent exe "!bzip2 -d ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "bzip2 -d" may have failed with <'.a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.bz2$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
+   call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)")
  elseif expand("%") =~ '.*\.zip' && executable("unzip")
-   " handle *.zip with unzip
-   silent exe "!unzip ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) unzip may have failed with <".a:fname.">")
-   endif
+   exe "!unzip ".a:fname
   let fname= substitute(a:fname,'\.zip$','','')
   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
+   call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)")
  endif
-
-  if a:0 == 0| setlocal noma bt=nofile fmr=[[[,]]] fdm=marker | endif
+  set noma bt=nofile fmr=[[[,]]] fdm=marker

 "  call Dret("Decompress")
 endfun
@@ -549,21 +417,20 @@ endfun
 " vimball#ShowMesg: {{{2
 fun! vimball#ShowMesg(level,msg)
 "  call Dfunc("vimball#ShowMesg(level=".a:level." msg<".a:msg.">)")
-
  let rulerkeep   = &ruler
  let showcmdkeep = &showcmd
  set noruler noshowcmd
  redraw!

  if &fo =~ '[ta]'
-   echomsg "***vimball*** ".a:msg
+   echomsg "***vimball*** " a:msg
  else
   if a:level == s:WARNING || a:level == s:USAGE
    echohl WarningMsg
   elseif a:level == s:ERROR
    echohl Error
   endif
-   echomsg "***vimball*** ".a:msg
+   echomsg "***vimball*** " a:msg
   echohl None
  endif

@@ -576,26 +443,36 @@ fun! vimball#ShowMesg(level,msg)

 "  call Dret("vimball#ShowMesg")
 endfun
+
+" ---------------------------------------------------------------------
+let &cpo= s:keepcpo
+unlet s:keepcpo
 " =====================================================================
 " s:ChgDir: change directory (in spite of Windoze) {{{2
 fun! s:ChgDir(newdir)
 "  call Dfunc("ChgDir(newdir<".a:newdir.">)")
  if (has("win32") || has("win95") || has("win64") || has("win16"))
-   try
-    exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
-   catch  /^Vim\%((\a\+)\)\=:E/
-    call mkdir(fnameescape(substitute(a:newdir,'/','\\','g')))
-    exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
-   endtry
+    exe 'silent cd '.escape(substitute(a:newdir,'/','\\','g'),' ')
  else
-   try
-    exe 'silent cd '.fnameescape(a:newdir)
-   catch  /^Vim\%((\a\+)\)\=:E/
-    call mkdir(fnameescape(a:newdir))
-    exe 'silent cd '.fnameescape(a:newdir)
-   endtry
+   exe 'silent cd '.escape(a:newdir,' ')
  endif
-"  call Dret("ChgDir : curdir<".getcwd().">")
+"  call Dret("ChgDir")
+endfun
+
+" ---------------------------------------------------------------------
+" s:Path: prepend and append quotes, do escaping, as necessary {{{2
+fun! s:Path(cmd,quote)
+"  call Dfunc("Path(cmd<".a:cmd."> quote<".a:quote.">)")
+  if (has("win32") || has("win95") || has("win64") || has("win16"))
+   let cmdpath= a:quote.substitute(a:cmd,'/','\\','g').a:quote
+  else
+   let cmdpath= a:quote.a:cmd.a:quote
+  endif
+  if a:quote == ""
+   let cmdpath= escape(cmdpath,' ')
+  endif
+"  call Dret("Path <".cmdpath.">")
+  return cmdpath
 endfun

 " ---------------------------------------------------------------------
@@ -608,20 +485,23 @@ fun! s:RecordInVar(home,cmd)
 "   else
 "    let s:recorddir= s:recorddir."|".substitute(a:cmd,'^rmdir',"call s:Rmdir",'')
 "   endif
+"   call Decho("recorddir=".s:recorddir)
  elseif !exists("s:recordfile")
   let s:recordfile= a:cmd
+"   call Decho("recordfile=".s:recordfile)
  else
   let s:recordfile= s:recordfile."|".a:cmd
+"   call Decho("recordfile=".s:recordfile)
  endif
-"  call Dret("RecordInVar : s:recordfile<".(exists("s:recordfile")? s:recordfile : "")."> s:recorddir<".(exists("s:recorddir")? s:recorddir : "").">")
+"  call Dret("RecordInVar")
 endfun

 " ---------------------------------------------------------------------
 " s:RecordInFile: {{{2
 fun! s:RecordInFile(home)
-"  call Dfunc("s:RecordInFile()")
+"  call Dfunc("RecordInFile()")
  if exists("g:vimball_norecord")
-"   call Dret("s:RecordInFile : g:vimball_norecord")
+"   call Dret("RecordInFile : (g:vimball_norecord)")
   return
  endif

@@ -629,12 +509,8 @@ fun! s:RecordInFile(home)
   let curdir= getcwd()
   call s:ChgDir(a:home)
   keepalt keepjumps 1split 
-
   let cmd= expand("%:tr").": "
-"   call Decho("cmd<".cmd.">")
-
-   sil! keepalt keepjumps e .VimballRecord
-   setlocal ma
+   silent! keepalt keepjumps e .VimballRecord
   $
   if exists("s:recordfile") && exists("s:recorddir")
   	let cmd= cmd.s:recordfile."|".s:recorddir
@@ -643,47 +519,44 @@ fun! s:RecordInFile(home)
   elseif exists("s:recordfile")
   	let cmd= cmd.s:recordfile
   else
-"    call Dret("s:RecordInFile : neither recordfile nor recorddir exist")
+"    call Dret("RecordInFile")
 	return
   endif
-"   call Decho("cmd<".cmd.">")
-
-   " put command into buffer, write .VimballRecord `file
   keepalt keepjumps put=cmd
-   sil! keepalt keepjumps g/^\s*$/d
-   sil! keepalt keepjumps wq!
+   silent! keepalt keepjumps g/^\s*$/d
+   silent! keepalt keepjumps wq!
   call s:ChgDir(curdir)
-
-   if exists("s:recorddir")
-"	call Decho("unlet s:recorddir<".s:recorddir.">")
-   	unlet s:recorddir
-   endif
-   if exists("s:recordfile")
-"	call Decho("unlet s:recordfile<".s:recordfile.">")
-   	unlet s:recordfile
-   endif
+   if exists("s:recorddir") |unlet s:recorddir |endif
+   if exists("s:recordfile")|unlet s:recordfile|endif
  else
 "   call Decho("s:record[file|dir] doesn't exist")
  endif

-"  call Dret("s:RecordInFile")
+"  call Dret("RecordInFile")
 endfun

 " ---------------------------------------------------------------------
-" vimball#VimballHome: determine/get home directory path (usually from rtp) {{{2
-fun! vimball#VimballHome()
-"  call Dfunc("vimball#VimballHome()")
+" s:Rmdir: {{{2
+"fun! s:Rmdir(dirname)
+""  call Dfunc("s:Rmdir(dirname<".a:dirname.">)")
+"  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
+"    call system("del ".a:dirname)
+"  else
+"   call system("rmdir ".a:dirname)
+"  endif
+""  call Dret("s:Rmdir")
+"endfun
+
+" ---------------------------------------------------------------------
+" s:VimballHome: determine/get home directory path (usually from rtp) {{{2
+fun! s:VimballHome()
+"  call Dfunc("VimballHome()")
  if exists("g:vimball_home")
   let home= g:vimball_home
  else
   " go to vim plugin home
   for home in split(&rtp,',') + ['']
    if isdirectory(home) && filewritable(home) | break | endif
-	let basehome= substitute(home,'[/\\]\.vim$','','')
-    if isdirectory(basehome) && filewritable(basehome)
-	 let home= basehome."/.vim"
-	 break
-	endif
   endfor
   if home == ""
    " just pick the first directory
@@ -693,25 +566,13 @@ fun! vimball#VimballHome()
    let home= substitute(home,'/','\\','g')
   endif
  endif
-  " insure that the home directory exists
-"  call Decho("picked home<".home.">")
-  if !isdirectory(home)
-   if exists("g:vimball_mkdir")
-"	call Decho("home<".home."> isn't a directory -- making it now with g:vimball_mkdir<".g:vimball_mkdir.">")
-"    call Decho("system(".g:vimball_mkdir." ".shellescape(home).")")
-    call system(g:vimball_mkdir." ".shellescape(home))
-   else
-"	call Decho("home<".home."> isn't a directory -- making it now with mkdir()")
-    call mkdir(home)
-   endif
-  endif
-"  call Dret("vimball#VimballHome <".home.">")
+"  call Dret("VimballHome <".home.">")
  return home
 endfun

 " ---------------------------------------------------------------------
-" vimball#SaveSettings: {{{2
-fun! vimball#SaveSettings()
+" s:SaveSettings: {{{2
+fun! s:SaveSettings()
 "  call Dfunc("SaveSettings()")
  let s:makeep  = getpos("'a")
  let s:regakeep= @a
@@ -719,34 +580,30 @@ fun! vimball#SaveSettings()
   let s:acdkeep = &acd
  endif
  let s:eikeep  = &ei
-  let s:fenkeep = &l:fen
+  let s:fenkeep = &fen
  let s:hidkeep = &hidden
  let s:ickeep  = &ic
  let s:lzkeep  = &lz
  let s:pmkeep  = &pm
  let s:repkeep = &report
  let s:vekeep  = &ve
-  let s:ffkeep  = &l:ff
-  let s:swfkeep = &l:swf
  if exists("&acd")
-   setlocal ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
+   set ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm=
  else
-   setlocal ei=all ve=all       nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
+   set ei=all ve=all nofen noic report=999 nohid bt= ma lz pm=
  endif
-  " vimballs should be in unix format
-  setlocal ff=unix
 "  call Dret("SaveSettings")
 endfun

 " ---------------------------------------------------------------------
-" vimball#RestoreSettings: {{{2
-fun! vimball#RestoreSettings()
+" s:RestoreSettings: {{{2
+fun! s:RestoreSettings()
 "  call Dfunc("RestoreSettings()")
  let @a      = s:regakeep
  if exists("&acd")
   let &acd   = s:acdkeep
  endif
-  let &l:fen  = s:fenkeep
+  let &fen    = s:fenkeep
  let &hidden = s:hidkeep
  let &ic     = s:ickeep
  let &lz     = s:lzkeep
@@ -754,22 +611,20 @@ fun! vimball#RestoreSettings()
  let &report = s:repkeep
  let &ve     = s:vekeep
  let &ei     = s:eikeep
-  let &l:ff   = s:ffkeep
  if s:makeep[0] != 0
   " restore mark a
 "   call Decho("restore mark-a: makeep=".string(makeep))
   call setpos("'a",s:makeep)
  endif
  if exists("&acd")
-   unlet s:acdkeep
+   unlet s:regakeep s:acdkeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep
+  else
+   unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep
  endif
-  unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep s:ffkeep
+  set bt=nofile noma
 "  call Dret("RestoreSettings")
 endfun

-let &cpo = s:keepcpo
-unlet s:keepcpo
-
 " ---------------------------------------------------------------------
 " Modelines: {{{1
 " vim: fdm=marker
@@ -381,3 +381,4 @@ let g:xmldata_html32 = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -466,3 +466,4 @@ let g:xmldata_html401t = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -408,3 +408,4 @@ let g:xmldata_html401s = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -458,3 +458,4 @@ let g:xmldata_html401t = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -466,3 +466,4 @@ let g:xmldata_html40t = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -408,3 +408,4 @@ let g:xmldata_html40s = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -458,3 +458,4 @@ let g:xmldata_html40t = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -467,3 +467,4 @@ let g:xmldata_xhtml10f = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -408,3 +408,4 @@ let g:xmldata_xhtml10s = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -458,3 +458,4 @@ let g:xmldata_xhtml10t = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -432,3 +432,4 @@ let g:xmldata_xhtml11 = {
 \ 'param': ['/>', ''],
 \ }
 \ }
+" vim:ft=vim:ff=unix
@@ -1,12 +1,10 @@
 " Vim completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2013 Jun 29
-" Version: 1.9
+" Last Change:	2006 Jul 18
+" Version: 1.8
 "
 " Changelog:
-" 1.9 - 2007 Aug 15
-" 		- fix closing of namespaced tags (Johannes Weiss)
 " 1.8 - 2006 Jul 18
 "       - allow for closing of xml tags even when data file isn't available

@@ -415,12 +413,12 @@ function! xmlcomplete#GetLastOpenTag(unaryTagsStack)

 	if exists("b:xml_namespace")
 		if b:xml_namespace == 'DEFAULT'
-			let tagpat='</\=\(\k\|[.:-]\)\+\|/>'
+			let tagpat='</\=\(\k\|[.-]\)\+\|/>'
 		else
 			let tagpat='</\='.b:xml_namespace.':\(\k\|[.-]\)\+\|/>'
 		endif
 	else
-		let tagpat='</\=\(\k\|[.:-]\)\+\|/>'
+		let tagpat='</\=\(\k\|[.-]\)\+\|/>'
 	endif
 	while (linenum>0)
 		let line=getline(linenum)
@@ -475,12 +473,12 @@ function! s:InCommentAt(line, col)
 endfunction

 function! s:SetKeywords()
-	let s:IsKeywordBak=&l:iskeyword
-	let &l:iskeyword='33-255'
+	let g:IsKeywordBak=&iskeyword
+	let &iskeyword='33-255'
 endfunction

 function! s:RestoreKeywords()
-	let &l:iskeyword=s:IsKeywordBak
+	let &iskeyword=g:IsKeywordBak
 endfunction

 function! s:Push(el, sname)
@@ -1,36 +1,28 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Jul 02, 2013
-" Version:	27
-" Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
+" Date:		May 08, 2007
+" Version:	14
+" Maintainer:	Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
-" Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
-"               zip.vim and zipPlugin.vim are provided *as is* and comes with
-"               no warranty of any kind, either expressed or implied. By using
-"               this plugin, you agree that in no event will the copyright
+"               zipPlugin.vim is provided *as is* and comes with no warranty
+"               of any kind, either expressed or implied. By using this
+"               plugin, you agree that in no event will the copyright
 "               holder be liable for any damages resulting from the use
 "               of this software.
-"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore()

 " ---------------------------------------------------------------------
 " Load Once: {{{1
-if &cp || exists("g:loaded_zip")
- finish
-endif
-let g:loaded_zip= "v27"
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of zip needs vim 7.2"
- echohl Normal
- finish
-endif
 let s:keepcpo= &cpo
 set cpo&vim
-"DechoTabOn
+if &cp || exists("g:loaded_zip") || v:version < 700
+ finish
+endif

+let g:loaded_zip     = "v14"
 let s:zipfile_escape = ' ?&;\'
 let s:ERROR          = 2
 let s:WARNING        = 1
@@ -39,9 +31,7 @@ let s:NOTE           = 0
 " ---------------------------------------------------------------------
 "  Global Values: {{{1
 if !exists("g:zip_shq")
- if &shq != ""
-  let g:zip_shq= &shq
- elseif has("unix")
+ if has("unix")
  let g:zip_shq= "'"
 else
  let g:zip_shq= '"'
@@ -62,26 +52,10 @@ endif
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
 "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
-  " sanity check: insure that the zipfile has "PK" as its first two letters
-  "               (zipped files have a leading PK as a "magic cookie")
-  if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
-   exe "noautocmd e ".fnameescape(a:zipfile)
-"   call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
-   return
-"  else        " Decho
-"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file")
-  endif
-
  let repkeep= &report
  set report=10

  " sanity checks
-  if !exists("*fnameescape")
-   if &verbose > 1
-    echoerr "the zip plugin is not available (your vim doens't support fnameescape())"
-   endif
-   return
-  endif
  if !executable(g:zip_unzipcmd)
   redraw!
   echohl Error | echo "***error*** (zip#Browse) unzip not available on your system"
@@ -115,26 +89,37 @@ fun! zip#Browse(zipfile)
  set ft=tar

  " give header
-  call append(0, ['" zip.vim version '.g:loaded_zip,
- \                '" Browsing zipfile '.a:zipfile,
- \                '" Select a file with cursor and press ENTER'])
-  keepj $
+  exe "$put ='".'\"'." zip.vim version ".g:loaded_zip."'"
+  exe "$put ='".'\"'." Browsing zipfile ".a:zipfile."'"
+  exe "$put ='".'\"'." Select a file with cursor and press ENTER"."'"
+  $put =''
+  0d
+  $

-"  call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1))
-  exe "keepj sil! r! ".g:zip_unzipcmd." -Z -1 -- ".s:Escape(a:zipfile,1)
+"  call Decho("exe silent r! ".g:zip_unzipcmd." -l ".s:QuoteFileDir(a:zipfile))
+  exe "silent r! ".g:zip_unzipcmd." -l ".s:QuoteFileDir(a:zipfile)
  if v:shell_error != 0
   redraw!
-   echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None
+   echohl WarningMsg | echo "***warning*** (zip#Browse) ".a:zipfile." is not a zip file" | echohl None
 "   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   keepj sil! %d
+   silent %d
   let eikeep= &ei
   set ei=BufReadCmd,FileReadCmd
-   exe "keepj r ".fnameescape(a:zipfile)
+   exe "r ".a:zipfile
   let &ei= eikeep
-   keepj 1d
+   1d
 "   call Dret("zip#Browse")
   return
  endif
+"  call Decho("line 6: ".getline(6))
+  let namecol= stridx(getline(6),'Name') + 1
+"  call Decho("namecol=".namecol)
+  4,$g/^\s*----/d
+  4,$g/^\s*\a/d
+  $d
+  if namecol > 0
+   exe 'silent 4,$s/^.*\%'.namecol.'c//'
+  endif

  setlocal noma nomod ro
  noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
@@ -175,12 +160,10 @@ fun! s:ZipBrowseSelect()
 "  call Decho("curfile<".curfile.">")

  new
-  if !exists("g:zip_nomax") || g:zip_nomax == 0
-   wincmd _
-  endif
+  wincmd _
  let s:zipfile_{winnr()}= curfile
-"  call Decho("exe e ".fnameescape("zipfile:".zipfile.'::'.fname))
-  exe "e ".fnameescape("zipfile:".zipfile.'::'.fname)
+"  call Decho("exe e zipfile:".escape(zipfile,s:zipfile_escape).'::'.escape(fname,s:zipfile_escape))
+  exe "e zipfile:".escape(zipfile,s:zipfile_escape).'::'.escape(fname,s:zipfile_escape)
  filetype detect

  let &report= repkeep
@@ -200,28 +183,16 @@ fun! zip#Read(fname,mode)
  else
   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
-   let fname   = substitute(fname, '[', '[[]', 'g')
+   let fname = substitute(fname, '[', '[[]', 'g')
  endif
 "  call Decho("zipfile<".zipfile.">")
 "  call Decho("fname  <".fname.">")

-  " the following code does much the same thing as
-  "   exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1)
-  " but allows zipfile:... entries in quickfix lists
-  let temp = tempname()
-"  call Decho("using temp file<".temp.">")
-  let fn   = expand('%:p')
-  exe "sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp
-"  call Decho("exe sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp)
-  sil exe 'keepalt file '.temp
-  sil keepj e!
-  sil exe 'keepalt file '.fnameescape(fn)
-  call delete(temp)
-
-  filetype detect
+"  call Decho("exe r! ".g:zip_unzipcmd." -p ".s:QuoteFileDir(zipfile)." ".s:QuoteFileDir(fname))
+  exe "silent r! ".g:zip_unzipcmd." -p ".s:QuoteFileDir(zipfile)." ".s:QuoteFileDir(fname)

  " cleanup
-  "  keepj 0d   " used to be needed for the ...r! ... method
+  0d
  set nomod

  let &report= repkeep
@@ -290,8 +261,8 @@ fun! zip#Write(fname)

  if fname =~ '/'
   let dirpath = substitute(fname,'/[^/]\+$','','e')
-   if has("win32unix") && executable("cygpath")
-    let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e')
+   if executable("cygpath")
+    let dirpath = substitute(system("cygpath ".dirpath),'\n','','e')
   endif
 "   call Decho("mkdir(dirpath<".dirpath.">,p)")
   call mkdir(dirpath,"p")
@@ -301,17 +272,17 @@ fun! zip#Write(fname)
  endif
 "  call Decho("zipfile<".zipfile."> fname<".fname.">")

-  exe "w! ".fnameescape(fname)
-  if has("win32unix") && executable("cygpath")
-   let zipfile = substitute(system("cygpath ".s:Escape(zipfile,0)),'\n','','e')
+  exe "w! ".escape(fname,s:zipfile_escape)
+  if executable("cygpath")
+   let zipfile = substitute(system("cygpath ".zipfile),'\n','','e')
  endif

  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
    let fname = substitute(fname, '[', '[[]', 'g')
  endif

-"  call Decho(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
-  call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
+"  call Decho(g:zip_zipcmd." -u ".s:QuoteFileDir(zipfile)." ".s:QuoteFileDir(fname))
+  call system(g:zip_zipcmd." -u ".s:QuoteFileDir(zipfile)." ".s:QuoteFileDir(fname))
  if v:shell_error != 0
   redraw!
   echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
@@ -325,7 +296,7 @@ fun! zip#Write(fname)
   let binkeep= &binary
   let eikeep = &ei
   set binary ei=all
-   exe "e! ".fnameescape(zipfile)
+   exe "e! ".zipfile
   call netrw#NetWrite(netzipfile)
   let &ei     = eikeep
   let &binary = binkeep
@@ -345,20 +316,11 @@ fun! zip#Write(fname)
 endfun

 " ---------------------------------------------------------------------
-" s:Escape: {{{2
-fun! s:Escape(fname,isfilt)
-"  call Dfunc("QuoteFileDir(fname<".a:fname."> isfilt=".a:isfilt.")")
-  if exists("*shellescape")
-   if a:isfilt
-    let qnameq= shellescape(a:fname,1)
-   else
-    let qnameq= shellescape(a:fname)
-   endif
-  else
-   let qnameq= g:zip_shq.escape(a:fname,g:zip_shq).g:zip_shq
-  endif
-"  call Dret("QuoteFileDir <".qnameq.">")
-  return qnameq
+" QuoteFileDir: {{{2
+fun! s:QuoteFileDir(fname)
+"  call Dfunc("QuoteFileDir(fname<".a:fname.">)")
+"  call Dret("QuoteFileDir")
+  return g:zip_shq.a:fname.g:zip_shq
 endfun

 " ---------------------------------------------------------------------
@@ -366,8 +328,14 @@ endfun
 fun! s:ChgDir(newdir,errlvl,errmsg)
 "  call Dfunc("ChgDir(newdir<".a:newdir."> errlvl=".a:errlvl."  errmsg<".a:errmsg.">)")

+  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
+   let newdir= escape(a:newdir,' ')
+  else
+   let newdir= escape(a:newdir,'\ ')
+  endif
+
  try
-   exe "cd ".fnameescape(a:newdir)
+   exe "cd ".newdir
  catch /^Vim\%((\a\+)\)\=:E344/
   redraw!
   if a:errlvl == s:NOTE
@@ -387,13 +355,13 @@ fun! s:ChgDir(newdir,errlvl,errmsg)
 endfun

 " ---------------------------------------------------------------------
-" s:Rmdir: {{{2
+" Rmdir: {{{2
 fun! s:Rmdir(fname)
 "  call Dfunc("Rmdir(fname<".a:fname.">)")
  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
-   call system("rmdir /S/Q ".s:Escape(a:fname,0))
+   call system("rmdir /S/Q ".s:QuoteFileDir(a:fname))
  else
-   call system("/bin/rm -rf ".s:Escape(a:fname,0))
+   call system("/bin/rm -rf ".s:QuoteFileDir(a:fname))
  endif
 "  call Dret("Rmdir")
 endfun
@@ -50,9 +50,6 @@ If you think you have a color scheme that is good enough to be used by others,
 please check the following items:

 - Does it work in a color terminal as well as in the GUI?
- Is "g:colors_name" set to a meaningful value?  In case of doubt you can do
-  it this way:
-  	let g:colors_name = expand('<sfile>:t:r')
 - Is 'background' either used or appropriately set to "light" or "dark"?
 - Try setting 'hlsearch' and searching for a pattern, is the match easy to
  spot?
@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Last Change:	2008 Jul 18
+" Last Change:	2006 Apr 30

 " darkblue -- for those who prefer dark background
 " [note: looks bit uglier with come terminal palettes,
@@ -58,9 +58,3 @@ hi PreProc	ctermfg=magenta guifg=#ff80ff gui=none cterm=none
 hi type		ctermfg=green guifg=#60ff60 gui=none cterm=none
 hi Underlined	cterm=underline term=underline
 hi Ignore	guifg=bg ctermfg=bg
-
-" suggested by tigmoid, 2008 Jul 18
-hi Pmenu guifg=#c0c0c0 guibg=#404080
-hi PmenuSel guifg=#c0c0c0 guibg=#2050d0
-hi PmenuSbar guifg=blue guibg=darkgray
-hi PmenuThumb guifg=#c0c0c0
@@ -1,9 +1,9 @@
 " Vim color file
 " Maintainer:	Hans Fugal <hans@fugal.net>
-" Last Change:	$Date: 2004/06/13 19:30:30 $
-" Last Change:	$Date: 2004/06/13 19:30:30 $
+" Last Change:	$Date$
+" Last Change:	$Date$
 " URL:		http://hans.fugal.net/vim/colors/desert.vim
-" Version:	$Id: desert.vim,v 1.1 2004/06/13 19:30:30 vimboss Exp $
+" Version:	$Id$

 " cool help screens
 " :he group-name
@@ -2,7 +2,7 @@
 " vim: tw=0 ts=4 sw=4
 " Vim color file
 " Maintainer:	Ron Aaron <ron@ronware.org>
-" Last Change:	2013 May 23
+" Last Change:	2006 Dec 10

 hi clear
 set background=dark
@@ -43,8 +43,6 @@ hi MatchParen	  term=reverse  ctermfg=blue guibg=Blue
 hi TabLine		  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
 hi TabLineFill	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
 hi TabLineSel	  term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
-hi Underlined	  term=underline cterm=bold,underline ctermfg=lightblue guifg=lightblue gui=bold,underline
-hi Ignore		  ctermfg=black ctermbg=black guifg=black guibg=black
 hi link IncSearch		Visual
 hi link String			Constant
 hi link Character		Constant
@@ -0,0 +1,125 @@
+" MacVim colorscheme
+"
+" Maintainer:   Bjorn Winckler <bjorn.winckler@gmail.com>
+" Last Change:  2007 Nov 17
+"
+" This is the default MacVim color scheme.  It supports both light and dark
+" backgrounds (see :h 'background').
+"
+
+
+highlight clear
+
+" Reset String -> Constant links etc if they were reset
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "macvim"
+
+
+"
+" First list all groups common to both 'light' and 'dark' background.
+"
+
+" `:he highlight-groups`
+hi DiffAdd      guibg=MediumSeaGreen
+hi Directory    guifg=#1600FF
+hi ErrorMsg     guibg=Firebrick2 guifg=White
+hi FoldColumn   guibg=Grey guifg=DarkBlue
+hi Folded       guibg=#E6E6E6 guifg=DarkBlue
+hi IncSearch    gui=reverse
+hi ModeMsg      gui=bold
+hi MoreMsg      gui=bold guifg=SeaGreen4
+hi NonText      gui=bold guifg=Blue
+hi Pmenu        guibg=LightSteelBlue1
+hi PmenuSbar    guibg=Grey
+hi PmenuSel     guifg=White guibg=SkyBlue4
+hi PmenuThumb   gui=reverse
+hi Question     gui=bold guifg=Chartreuse4
+hi SignColumn   guibg=Grey guifg=DarkBlue
+hi SpecialKey   guifg=Blue
+hi SpellBad     guisp=Firebrick2 gui=undercurl
+hi SpellCap     guisp=Blue gui=undercurl
+hi SpellLocal   guisp=DarkCyan gui=undercurl
+hi SpellRare    guisp=Magenta gui=undercurl
+hi StatusLine   gui=NONE guifg=White guibg=DarkSlateGray
+hi StatusLineNC gui=NONE guifg=SlateGray guibg=Gray90
+hi TabLine      gui=underline guibg=LightGrey
+hi TabLineFill  gui=reverse
+hi TabLineSel   gui=bold
+hi Title        gui=bold guifg=DeepSkyBlue3
+hi VertSplit    gui=NONE guifg=DarkSlateGray guibg=Gray90
+hi Visual       guibg=MacSelectedTextBackgroundColor
+hi WarningMsg   guifg=Firebrick2
+
+" Syntax items (`:he group-name` -- more groups are available, these are just
+" the top level syntax items for now).
+hi Error        gui=NONE guifg=White guibg=Firebrick3
+hi Identifier   gui=NONE guifg=Aquamarine4 guibg=NONE
+hi Ignore       gui=NONE guifg=bg guibg=NONE
+hi PreProc      gui=NONE guifg=DodgerBlue3 guibg=NONE
+hi Special      gui=NONE guifg=BlueViolet guibg=NONE
+hi String       gui=NONE guifg=SkyBlue4 guibg=NONE
+hi Underlined   gui=underline guifg=SteelBlue1
+
+
+"
+" Groups that differ between 'light' and 'dark' background.
+"
+
+if &background == "dark"
+  hi Boolean      gui=NONE guifg=DeepPink4 guibg=NONE
+  hi Comment      gui=italic guifg=CadetBlue3
+  hi Constant     gui=NONE guifg=Goldenrod1 guibg=NONE
+  hi Cursor       guibg=LightGoldenrod guifg=bg
+  hi CursorColumn guibg=Gray20
+  hi CursorIM     guibg=LightSlateGrey guifg=bg
+  hi CursorLine   guibg=Gray20
+  hi DiffChange   guibg=MediumPurple4
+  hi DiffDelete   gui=bold guifg=White guibg=SlateBlue
+  hi DiffText     gui=NONE guifg=White guibg=SteelBlue
+  hi LineNr       guifg=#552A7B guibg=Grey5
+  hi MatchParen   guifg=White guibg=Magenta
+  hi Normal       guifg=Grey50 guibg=Grey10
+  hi Search       guibg=Blue4 guifg=NONE
+  hi Statement    gui=bold guifg=Purple1 guibg=NONE
+  hi Todo         gui=NONE guifg=Green4 guibg=DeepSkyBlue1
+  hi Type         gui=bold guifg=Cyan4 guibg=NONE
+  hi WildMenu     guibg=SkyBlue guifg=White
+  hi lCursor      guibg=LightSlateGrey guifg=bg
+else
+  hi Boolean      gui=NONE guifg=Red3 guibg=NONE
+  hi Comment      gui=italic guifg=Blue2 guibg=NONE
+  hi Constant     gui=NONE guifg=DarkOrange guibg=NONE
+  hi Cursor       guibg=fg guifg=bg
+  hi CursorColumn guibg=#F1F5FA
+  hi CursorIM     guibg=fg guifg=bg
+  hi CursorLine   guibg=#F1F5FA
+  hi DiffChange   guibg=DeepSkyBlue
+  hi DiffDelete   gui=bold guifg=Black guibg=SlateBlue
+  hi DiffText     gui=NONE guibg=Gold
+  hi LineNr       guifg=#888888 guibg=#E6E6E6
+  hi MatchParen   guifg=White guibg=MediumPurple1
+  hi Normal       gui=NONE guifg=MacTextColor guibg=MacTextBackgroundColor
+  hi Search       guibg=CadetBlue1 guifg=NONE
+  hi Statement    gui=bold guifg=Maroon guibg=NONE
+  hi Todo         gui=NONE guifg=DarkGreen guibg=PaleGreen1
+  hi Type         gui=bold guifg=Green4 guibg=NONE
+  hi WildMenu     guibg=SkyBlue guifg=Black
+  hi lCursor      guibg=fg guifg=bg
+endif
+
+
+"
+" Change the selection color on focus change (but only if the "macvim"
+" colorscheme is active).
+"
+if !exists("s:augroups_defined")
+  au FocusLost * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSecondarySelectedControlColor | endif
+  au FocusGained * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSelectedTextBackgroundColor | endif
+
+  let s:augroups_defined = 1
+endif
+
+" vim: sw=2
@@ -2,7 +2,7 @@
 " vim: tw=0 ts=4 sw=4
 " Vim color file
 " Maintainer:	Ron Aaron <ron@ronware.org>
-" Last Change:	2013 May 24
+" Last Change:	2003 May 02

 set background=dark
 hi clear
@@ -11,7 +11,7 @@ if exists("syntax_on")
 endif
 let g:colors_name = "ron"
 hi Normal		guifg=cyan	guibg=black
-hi NonText		guifg=yellow guibg=#303030
+hi NonText		guifg=brown
 hi comment		guifg=green
 hi constant		guifg=cyan	gui=bold
 hi identifier	guifg=cyan	gui=NONE
@@ -24,11 +24,10 @@ hi WarningMsg	guifg=Black	guibg=Green
 hi Error		guibg=Red
 hi Todo			guifg=Black	guibg=orange
 hi Cursor		guibg=#60a060 guifg=#00ff00
-hi Search		guibg=darkgray guifg=black gui=bold 
+hi Search		guibg=lightslateblue
 hi IncSearch	gui=NONE guibg=steelblue
 hi LineNr		guifg=darkgrey
 hi title		guifg=darkgrey
-hi ShowMarksHL ctermfg=cyan ctermbg=lightblue cterm=bold guifg=yellow guibg=black  gui=bold
 hi StatusLineNC	gui=NONE guifg=lightblue guibg=darkblue
 hi StatusLine	gui=bold	guifg=cyan	guibg=blue
 hi label		guifg=gold2
@@ -42,4 +41,3 @@ hi DiffDelete   guibg=coral
 hi Folded		guibg=gray30
 hi FoldColumn	guibg=gray30 guifg=white
 hi cIf0			guifg=gray
-hi diffOnly	guifg=red gui=bold
@@ -9,7 +9,6 @@ if version > 580
 syntax reset
 endif
 endif
-let colors_name = "slate"
 :hi Normal guifg=White guibg=grey15
 :hi Cursor guibg=khaki guifg=slategrey
 :hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
@@ -1,7 +1,8 @@
 " Vim compiler file
 " Compiler:	Checkstyle
-" Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jun 26
+" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/checkstyle.vim
+" Last Change:	2004 Nov 27

 if exists("current_compiler")
  finish
@@ -16,4 +17,4 @@ CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain

 " sample error: WebTable.java:282: '+=' is not preceeded with whitespace.
 "		WebTable.java:201:1: '{' should be on the previous line.
-CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%#
+CompilerSet errorformat=%f:%l:\ %m,%f:%l:%v:\ %m,%-G%.%#
@@ -1,26 +1,19 @@
 " Vim compiler file
-" Compiler:	Microsoft Visual Studio C#
-" Maintainer:	Zhou YiChao (broken.zhou@gmail.com)
-" Previous Maintainer:	Joseph H. Yao (hyao@sina.com)
-" Last Change:	2012 Apr 30
+" Compiler:	ms C#
+" Maintainer:	Joseph H. Yao (hyao@sina.com)
+" Last Change:	2004 Mar 27

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "cs"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
 endif

+" default errorformat
 CompilerSet errorformat&
-CompilerSet errorformat+=%f(%l\\,%v):\ %t%*[^:]:\ %m,
-            \%trror%*[^:]:\ %m,
-            \%tarning%*[^:]:\ %m

+" default make
 CompilerSet makeprg=csc\ %
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,29 +0,0 @@
-" Vim compiler file
-" Compiler:	Cucumber
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 Aug 09
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "cucumber"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-CompilerSet makeprg=cucumber
-
-CompilerSet errorformat=
-      \%W%m\ (Cucumber::Undefined),
-      \%E%m\ (%.%#),
-      \%Z%f:%l,
-      \%Z%f:%l:%.%#
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim:set sw=2 sts=2:
@@ -1,37 +1,29 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada/Dec Ada compiler file
 "     Language: Ada (Dec Ada)
-"          $Id: decada.vim 887 2008-07-08 14:29:01Z krischik $
+"          $Id$
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischik <krischik@users.sourceforge.net>
-"      $Author: krischik $
-"        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
-"      Version: 4.6
-"    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/decada.vim $
+"   Maintainer:	Martin Krischik
+"      $Author$
+"        $Date$
+"      Version: 4.2
+"    $Revision$
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/decada.vim $
 "      History: 21.07.2006 MK New Dec Ada
 "               15.10.2006 MK Bram's suggestion for runtime integration
-"               08.09.2006 MK Correct double load protection.
 "    Help Page: compiler-decada
 "------------------------------------------------------------------------------

-if (exists("current_compiler") && current_compiler == "decada") || version < 700
+if (exists("current_compiler")	    &&
+   \ current_compiler == "decada")  ||
+   \ version < 700
   finish
 endif
-let s:keepcpo= &cpo
-set cpo&vim

 let current_compiler = "decada"

 if !exists("g:decada")
   let g:decada = decada#New ()
-
-   call ada#Map_Menu (
-     \'Dec Ada.Build',
-     \'<F7>',
-     \'call decada.Make ()')
-
-   call g:decada.Set_Session ()
 endif

 if exists(":CompilerSet") != 2
@@ -41,11 +33,15 @@ if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>
 endif

+call g:decada.Set_Session ()
+
 execute "CompilerSet makeprg="     . escape (g:decada.Make_Command, ' ')
 execute "CompilerSet errorformat=" . escape (g:decada.Error_Format, ' ')

-let &cpo = s:keepcpo
-unlet s:keepcpo
+call ada#Map_Menu (
+  \'Dec Ada.Build',
+  \'<F7>',
+  \'call decada.Make ()')

 finish " 1}}}

@@ -1,13 +0,0 @@
-" Vim compiler file
-" Compiler:     Erlang
-" Maintainer:	Dmitry Vasiliev <dima at hlabs dot org>
-" Last Change:	2012-02-13
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "erlang"
-
-CompilerSet makeprg=erlc\ -Wall\ %
-
-CompilerSet errorformat=%f:%l:\ %m
@@ -1,7 +1,9 @@
 " Vim compiler file
 " Language:		eRuby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
-" URL:			https://github.com/vim-ruby/vim-ruby
+" Info:			$Id$
+" URL:			http://vim-ruby.rubyforge.org
+" Anon CVS:		See above site
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>

 if exists("current_compiler")
@@ -36,4 +38,4 @@ CompilerSet errorformat=
 let &cpo = s:cpo_save
 unlet s:cpo_save

-" vim: nowrap sw=2 sts=2 ts=8:
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:
@@ -1,8 +1,8 @@
 " Vim compiler file
 " Compiler:     g77 (GNU Fortran)
 " Maintainer:   Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-" Last Change:  $Date: 2004/06/13 18:17:36 $
-" $Revision: 1.1 $
+" Last Change:  $Date$
+" $Revision$

 if exists("current_compiler")
  finish
@@ -1,28 +0,0 @@
-" Compiler: G95
-" Maintainer: H Xu <xuhdev@gmail.com>
-" Version: 0.1.3
-" Last Change: 2012 Apr 30
-" Homepage: http://www.vim.org/scripts/script.php?script_id=3492
-"           https://bitbucket.org/xuhdev/compiler-g95.vim
-" License: Same as Vim
-
-if exists('current_compiler')
-    finish
-endif
-let current_compiler = 'g95'
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet errorformat=
-            \%AIn\ file\ %f:%l,
-            \%-C%p1,
-            \%-Z%trror:\ %m,
-            \%-Z%tarning\ (%n):\ %m,
-            \%-C%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:         GNU C Compiler
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2010-10-14
+" Latest Revision:  2006-12-20

 if exists("current_compiler")
  finish
@@ -9,20 +9,13 @@ endif
 let current_compiler = "gcc"

 let s:cpo_save = &cpo
-set cpo&vim
+set cpo-=C

-CompilerSet errorformat=
-      \%*[^\"]\"%f\"%*\\D%l:%c:\ %m,
+setlocal errorformat=
      \%*[^\"]\"%f\"%*\\D%l:\ %m,
-      \\"%f\"%*\\D%l:%c:\ %m,
      \\"%f\"%*\\D%l:\ %m,
      \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once,
      \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.),
-      \%f:%l:%c:\ %trror:\ %m,
-      \%f:%l:%c:\ %tarning:\ %m,
-      \%f:%l:%c:\ %m,
-      \%f:%l:\ %trror:\ %m,
-      \%f:%l:\ %tarning:\ %m,
      \%f:%l:\ %m,
      \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
@@ -32,7 +25,7 @@ CompilerSet errorformat=
      \%DMaking\ %*\\a\ in\ %f

 if exists('g:compiler_gcc_ignore_unmatched_lines')
-  CompilerSet errorformat+=%-G%.%#
+  let &errorformat .= ',%-G%.%#'
 endif

 let &cpo = s:cpo_save
@@ -1,27 +0,0 @@
-" Compiler: GNU Fortran Compiler
-" Maintainer: H Xu <xuhdev@gmail.com>
-" Version: 0.1.3
-" Last Change: 2012 Apr 30
-" Homepage: http://www.vim.org/scripts/script.php?script_id=3496
-"           https://bitbucket.org/xuhdev/compiler-gfortran.vim
-" License: Same as Vim
-
-if exists('current_compiler')
-    finish
-endif
-let current_compiler = 'gfortran'
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet errorformat=
-            \%A%f:%l.%c:,
-            \%-Z%trror:\ %m,
-            \%-Z%tarning:\ %m,
-            \%-C%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,27 +1,25 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada/GNAT compiler file
 "     Language: Ada (GNAT)
-"          $Id: gnat.vim 887 2008-07-08 14:29:01Z krischik $
+"          $Id$
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>k
-"		Ned Okie <nokie@radford.edu>
-"      $Author: krischik $
-"        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
-"      Version: 4.6
-"    $Revision: 887 $
-"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/gnat.vim $
+"   Maintainer:	Martin Krischik
+"      $Author$
+"        $Date$
+"      Version: 4.2
+"    $Revision$
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/gnat.vim $
 "      History: 24.05.2006 MK Unified Headers
 "		16.07.2006 MK Ada-Mode as vim-ball
 "               15.10.2006 MK Bram's suggestion for runtime integration
-"		19.09.2007 NO use project file only when there is a project
 "    Help Page: compiler-gnat
 "------------------------------------------------------------------------------

-if (exists("current_compiler")&& current_compiler == "gnat") || version < 700
+if (exists("current_compiler")	    &&
+   \ current_compiler == "gnat")    ||
+   \ version < 700
   finish
 endif
-let s:keepcpo= &cpo
-set cpo&vim

 let current_compiler = "gnat"

@@ -48,8 +46,6 @@ if !exists("g:gnat")
      \ 'GNAT.Set Projectfile\.\.\.',
      \ ':SetProject',
      \ 'call gnat.Set_Project_File ()')
-
-   call g:gnat.Set_Session ()
 endif

 if exists(":CompilerSet") != 2
@@ -59,12 +55,11 @@ if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>
 endif

+call g:gnat.Set_Session ()
+
 execute "CompilerSet makeprg="     . escape (g:gnat.Get_Command('Make'), ' ')
 execute "CompilerSet errorformat=" . escape (g:gnat.Error_Format, ' ')

-let &cpo = s:keepcpo
-unlet s:keepcpo
-
 finish " 1}}}

 "------------------------------------------------------------------------------
@@ -1,28 +0,0 @@
-" Vim compiler file
-" Compiler:	Haml
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "haml"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-CompilerSet makeprg=haml\ -c
-
-CompilerSet errorformat=
-      \Haml\ %trror\ on\ line\ %l:\ %m,
-      \Syntax\ %trror\ on\ line\ %l:\ %m,
-      \%-G%.%#
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim:set sw=2 sts=2:
@@ -2,7 +2,7 @@
 " Compiler:	HP aCC
 " Maintainer:	Matthias Ulrich <matthias-ulrich@web.de>
 " URL:          http://www.subhome.de/vim/hp_acc.vim
-" Last Change:	2012 Apr 30
+" Last Change:	2005 Nov 19
 "
 "  aCC --version says: "HP ANSI C++ B3910B A.03.13"
 "  This compiler has been tested on:
@@ -19,8 +19,6 @@ if exists("current_compiler")
  finish
 endif
 let current_compiler = "hp_acc"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -32,7 +30,4 @@ CompilerSet errorformat=%A%trror\ %n\:\ \"%f\"\\,\ line\ %l\ \#\ %m,
         \%Z\ \ \ \ %p^%.%#,
         \%-C%.%#

-let &cpo = s:keepcpo
-unlet s:keepcpo
-
 " vim:ts=8:sw=4:cindent
@@ -1,27 +0,0 @@
-" Compiler: Intel Fortran Compiler
-" Maintainer: H Xu <xuhdev@gmail.com>
-" Version: 0.1.1
-" Last Change: 2012 Apr 30
-" Homepage: http://www.vim.org/scripts/script.php?script_id=3497
-"           https://bitbucket.org/xuhdev/compiler-ifort.vim
-" License: Same as Vim
-
-if exists('current_compiler')
-    finish
-endif
-let current_compiler = 'ifort'
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet errorformat=
-            \%A%f(%l):\ %trror\ \#%n:\ %m,
-            \%A%f(%l):\ %tarning\ \#%n:\ %m,
-            \%-Z%p^,
-            \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,14 +1,12 @@
 " Vim compiler file
 " Compiler:     Intel C++ 7.1
 " Maintainer:   David Harrison <david_jr@users.sourceforge.net>
-" Last Change:  2012 Apr 30
+" Last Change:  2004 May 16

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "intel"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -21,6 +19,3 @@ CompilerSet errorformat=%E%f(%l):\ error:\ %m,
 		    \%-Z\ \ %p^,
 		    \%-G\\s%#,
 		    \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,14 +1,12 @@
 " Vim compiler file
 " Compiler:	SGI IRIX 5.3 cc
 " Maintainer:	David Harrison <david_jr@users.sourceforge.net>
-" Last Change:	2012 Apr 30
+" Last Change:	2004 Mar 27

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "irix5_c"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -21,6 +19,3 @@ CompilerSet errorformat=\%Ecfe:\ Error:\ %f\\,\ line\ %l:\ %m,
 		     \%-Z\ %p^,
 		     \-G\\s%#,
 		     \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,14 +1,12 @@
 " Vim compiler file
 " Compiler:	SGI IRIX 5.3 CC or NCC
 " Maintainer:	David Harrison <david_jr@users.sourceforge.net>
-" Last Change:	2012 Apr 30
+" Last Change:	2004 Mar 27

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "irix5_cpp"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -21,6 +19,3 @@ CompilerSet errorformat=%E\"%f\"\\,\ line\ %l:\ error(%n):\ ,
 		      \%-Z\ \ %p%^,
 		      \%+C\ %\\{10}%.%#,
 		      \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,7 +1,8 @@
 " Vim compiler file
-" Compiler:	javac
-" Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2004 Nov 27
+" Compiler:     javac
+" Maintainer:   Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/javac.vim
+" Last Change:  2004 Nov 27

 if exists("current_compiler")
  finish
@@ -1,8 +1,8 @@
 " Vim Compiler File
 " Compiler:	Jikes
 " Maintainer:	Dan Sharp <dwsharp at hotmail dot com>
-" Last Change:	20 Jan 2009
-" URL:		http://dwsharp.users.sourceforge.net/vim/compiler
+" Last Change:	2004 Mar 27
+" URL:		http://mywebpage.netscape.com/sharppeople/vim/compiler

 if exists("current_compiler")
  finish
@@ -1,8 +1,7 @@
 " Vim compiler file
 " Compiler:    Mono C# Compiler
 " Maintainer:  Jarek Sobiecki <harijari@go2.pl>
-" Last Updated By: Peter Collingbourne
-" Latest Revision: 2012 Jul 19
+" Latest Revision: 2006-06-18

 if exists("current_compiler")
  finish
@@ -13,18 +12,13 @@ let s:cpo_save = &cpo
 set cpo-=C

 setlocal errorformat=
-         \%D%.%#Project\ \"%f/%[%^/\"]%#\"%.%#,
-         \%X%.%#Done\ building\ project\ \"%f/%[%^/\"]%#\"%.%#,
-         \%-G%\\s%.%#,
-         \%E%f(%l):\ error\ CS%n:%m,
-         \%W%f(%l):\ warning\ CS%n:%m,
         \%E%f(%l\\,%c):\ error\ CS%n:%m,
         \%W%f(%l\\,%c):\ warning\ CS%n:%m,
         \%E%>syntax\ error\\,%m,%Z%f(%l\\,%c):\ error\ CS%n:%m,
         \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
         \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
         \%DMaking\ %*\\a\ in\ %f,
-         \%-G%.%#
+         \%G-%.%#

 let &cpo = s:cpo_save
 unlet s:cpo_save
@@ -1,14 +1,12 @@
 " Vim compiler file
 " Compiler:	SGI IRIX 6.5 MIPS C (cc)
 " Maintainer:	David Harrison <david_jr@users.sourceforge.net>
-" Last Change:	2012 Apr 30
+" Last Change:	2004 Mar 27

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "mips_c"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -21,6 +19,3 @@ CompilerSet errorformat=%Ecc\-%n\ %.%#:\ ERROR\ File\ =\ %f\%\\,\ Line\ =\ %l,
 		    \%-Z\ \ %p^,
 		    \%-G\\s%#,
 		    \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,14 +1,12 @@
 " Vim compiler file
 " Compiler:	SGI IRIX 6.5 MIPSPro C (c89)
 " Maintainer:	David Harrison <david_jr@users.sourceforge.net>
-" Last Change:	2012 Apr 30
+" Last Change:	2004 Mar 27

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "mipspro_c89"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -22,6 +20,3 @@ CompilerSet errorformat=%Ecc\-%n\ %.%#:\ ERROR\ File\ =\ %f\%\\,\ Line\ =\ %l,
 		    \%+C\ \ %m,
 		    \%-G\\s%#,
 		    \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,14 +1,12 @@
 " Vim compiler file
 " Compiler:	SGI IRIX 6.5 MIPSPro C++ (CC)
 " Maintainer:	David Harrison <david_jr@users.sourceforge.net>
-" Last Change:	2012 Apr 30
+" Last Change:	2004 Mar 27

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "mipspro_cpp"
-let s:keepcpo= &cpo
-set cpo&vim

 if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
@@ -21,6 +19,3 @@ CompilerSet errorformat=%Ecc\-%n\ %.%#:\ ERROR\ File\ =\ %f\%\\,\ Line\ =\ %l,
 		    \%-Z\ \ %p^,
 		    \%-G\\s%#,
 		    \%-G%.%#
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,21 +0,0 @@
-" Vim compiler file
-" Compiler:	Microsoft Visual Studio C#
-" Maintainer:	Chiel ten Brinke (ctje92@gmail.com)
-" Last Change:	2013 May 13
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "msbuild"
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet errorformat=\ %#%f(%l\\\,%c):\ %m
-CompilerSet makeprg=msbuild\ /nologo\ /v:q\ /property:GenerateFullPaths=true
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,44 +0,0 @@
-" Vim Compiler File
-" Compiler:	ocaml
-" Maintainer:	See ftplugin/ocaml.vim (?)
-" Last Change:	June 2013 by Marc Weber
-"
-" Marc Weber's comments:
-" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
-" ocamake and whatnot. So which one to use?
-"
-" This error format was moved from ftplugin/ocaml.vim to this file,
-" because ftplugin is the wrong file to set an error format
-" and the error format itself is annoying because it joins many lines in this
-" error case:
-"
-"    Error: The implementation foo.ml does not match the interface foo.cmi:
-"    Modules do not match case.
-"
-" So having it here makes people opt-in
-
-
-if exists("current_compiler")
-    finish
-endif
-let current_compiler = "ocaml"
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-CompilerSet errorformat =
-      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
-      \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
-      \%+EReference\ to\ unbound\ regexp\ name\ %m,
-      \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
-      \%Wocamlyacc:\ w\ -\ %m,
-      \%-Zmake%.%#,
-      \%C%m,
-      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
-      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
-      \%D%*\\a:\ Entering\ directory\ `%f',
-      \%X%*\\a:\ Leaving\ directory\ `%f',
-      \%DMaking\ %*\\a\ in\ %f
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -1,7 +1,7 @@
 " Vim Compiler File
 " Compiler:     Perl syntax checks (perl -Wc)
-" Maintainer:   Christian J. Robinson <heptite@gmail.com>
-" Last Change:  2006 Aug 13
+" Maintainer:   Christian J. Robinson <infynity@onewest.net>
+" Last Change:  2004 Mar 27

 if exists("current_compiler")
  finish
@@ -15,20 +15,12 @@ endif
 let s:savecpo = &cpo
 set cpo&vim

-if exists('g:perl_compiler_force_warnings') && g:perl_compiler_force_warnings == 0
-	let s:warnopt = 'w'
-else
-	let s:warnopt = 'W'
-endif
-
 if getline(1) =~# '-[^ ]*T'
-	let s:taintopt = 'T'
+	CompilerSet makeprg=perl\ -WTc\ %
 else
-	let s:taintopt = ''
+	CompilerSet makeprg=perl\ -Wc\ %
 endif

-exe 'CompilerSet makeprg=perl\ -' . s:warnopt . s:taintopt . 'c\ %'
-
 CompilerSet errorformat=
 	\%-G%.%#had\ compilation\ errors.,
 	\%-G%.%#syntax\ OK,
@@ -1,7 +1,8 @@
 " Vim compiler file
-" Compiler:	PHP CLI
-" Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jun 25
+" Compiler:	PHP
+" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/php.vim
+" Last Change:	2004 Nov 27

 if exists("current_compiler")
  finish
@@ -16,11 +17,12 @@ let s:cpo_save = &cpo
 set cpo-=C

 CompilerSet makeprg=php\ -lq
-CompilerSet errorformat=%E<b>%.%#Parse\ error</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
-		    \%W<b>%.%#Notice</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
-		    \%E%.%#Parse\ error:\ %m\ in\ %f\ on\ line\ %l,
-		    \%W%.%#Notice:\ %m\ in\ %f\ on\ line\ %l,
-		    \%-G%.%#
+
+CompilerSet errorformat=%E<b>Parse\ error</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
+		       \%W<b>Notice</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
+		       \%EParse\ error:\ %m\ in\ %f\ on\ line\ %l,
+		       \%WNotice:\ %m\ in\ %f</b>\ on\ line\ %l,
+		       \%-G%.%#

 let &cpo = s:cpo_save
 unlet s:cpo_save
@@ -1,35 +0,0 @@
-" Vim compiler file
-" Language:		Rake
-" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" URL:			https://github.com/vim-ruby/vim-ruby
-" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "rake"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-CompilerSet makeprg=rake
-
-CompilerSet errorformat=
-      \%D(in\ %f),
-      \%\\s%#from\ %f:%l:%m,
-      \%\\s%#from\ %f:%l:,
-      \%\\s%##\ %f:%l:%m,
-      \%\\s%##\ %f:%l,
-      \%\\s%#[%f:%l:\ %#%m,
-      \%\\s%#%f:%l:\ %#%m,
-      \%\\s%#%f:%l:,
-      \%m\ [%f:%l]:
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: nowrap sw=2 sts=2 ts=8:
@@ -1,33 +0,0 @@
-" Vim compiler file
-" Language:		RSpec
-" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" URL:			https://github.com/vim-ruby/vim-ruby
-" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "rspec"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-CompilerSet makeprg=rspec
-
-CompilerSet errorformat=
-    \%f:%l:\ %tarning:\ %m,
-    \%E%.%#:in\ `load':\ %f:%l:%m,
-    \%E%f:%l:in\ `%*[^']':\ %m,
-    \%-Z\ \ \ \ \ \#\ %f:%l:%.%#,
-    \%E\ \ %\\d%\\+)%.%#,
-    \%C\ \ \ \ \ %m,
-    \%-G%.%#
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: nowrap sw=2 sts=2 ts=8:
@@ -9,7 +9,7 @@ endif
 let current_compiler = "rst"

 let s:cpo_save = &cpo
-set cpo&vim
+set cpo-=C

 setlocal errorformat=
      \%f:%l:\ (%tEBUG/0)\ %m,
@@ -1,10 +1,33 @@
 " Vim compiler file
 " Language:		Ruby
 " Function:		Syntax check and/or error reporting
-" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" URL:			https://github.com/vim-ruby/vim-ruby
+" Maintainer:		Tim Hammerquist <timh at rubyforge.org>
+" Info:			$Id$
+" URL:			http://vim-ruby.rubyforge.org
+" Anon CVS:		See above site
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
 " ----------------------------------------------------------------------------
+"
+" Changelog:
+" 0.2:	script saves and restores 'cpoptions' value to prevent problems with
+"	line continuations
+" 0.1:	initial release
+"
+" Contributors:
+"   Hugh Sasse <hgs@dmu.ac.uk>
+"   Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+"
+" Todo:
+"   match error type %m
+"
+" Comments:
+"   I know this file isn't perfect.  If you have any questions, suggestions,
+"   patches, etc., please don't hesitate to let me know.
+"
+"   This is my first experience with 'errorformat' and compiler plugins and
+"   I welcome any input from more experienced (or clearer-thinking)
+"   individuals.
+" ----------------------------------------------------------------------------

 if exists("current_compiler")
  finish
@@ -42,4 +65,4 @@ CompilerSet errorformat=
 let &cpo = s:cpo_save
 unlet s:cpo_save

-" vim: nowrap sw=2 sts=2 ts=8:
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:
@@ -1,7 +1,9 @@
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
-" URL:			https://github.com/vim-ruby/vim-ruby
+" Info:			$Id$
+" URL:			http://vim-ruby.rubyforge.org
+" Anon CVS:		See above site
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>

 if exists("current_compiler")
@@ -30,4 +32,4 @@ CompilerSet errorformat=\%W\ %\\+%\\d%\\+)\ Failure:,
 let &cpo = s:cpo_save
 unlet s:cpo_save

-" vim: nowrap sw=2 sts=2 ts=8:
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:
@@ -1,30 +0,0 @@
-" Vim compiler file
-" Compiler:	Sass
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "sass"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-CompilerSet makeprg=sass\ -c
-
-CompilerSet errorformat=
-      \%f:%l:%m\ (Sass::Syntax%trror),
-      \%ESyntax\ %trror:%m,
-      \%C%\\s%\\+on\ line\ %l\ of\ %f,
-      \%Z%.%#,
-      \%-G%.%#
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim:set sw=2 sts=2:
@@ -1,7 +1,8 @@
 " Vim compiler file
-" Compiler:	se (Liberty Eiffel Compiler)
-" Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jun 29
+" Compiler:	se (SmartEiffel Compiler)
+" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/se.vim
+" Last Change:	2004 Nov 27

 if exists("current_compiler")
  finish
@@ -15,15 +16,12 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C

-CompilerSet makeprg=se\ c
+CompilerSet makeprg=compile\ %

 CompilerSet errorformat=%W******\ Warning:\ %m,
 		    \%E******\ Fatal\ Error:\ %m,
 		    \%E******\ Error:\ %m,
-		    \%ZLine\ %l\ column\ %c\ in\ %.%#\ (%f)\ %\\=:,
-		    \%ZLine\ %l\ columns\ %c\\,\ %\\d%\\+\ %.%#\ (%f)\ %\\=:,
-		    \%+C%*[^\ ]%.%#,
-		    \%-GThe\ source\ lines\ involved,
+		    \%CLine\ %l\ column\ %c\ in\ %\\w%\\+\ (%f)\ :,
 		    \%-G%.%#

 let &cpo = s:cpo_save
--- a/Show More
+++ b/Show More