diff --git a/runtime/plugin/getscriptPlugin.vim b/runtime/plugin/getscriptPlugin.vim
index 7ae35cb..1d67382 100644
--- a/runtime/plugin/getscriptPlugin.vim
+++ b/runtime/plugin/getscriptPlugin.vim
@@ -19,7 +19,7 @@
  endif
  finish
 endif
-let g:loaded_getscriptPlugin = "v32"
+let g:loaded_getscriptPlugin = "v33"
 let s:keepcpo                = &cpo
 set cpo&vim
 
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index 9833e2b..e6a3c84 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_netrwPlugin")
  finish
 endif
-let g:loaded_netrwPlugin = "v141"
+let g:loaded_netrwPlugin = "v142"
 if v:version < 702
  echohl WarningMsg | echo "***netrw*** you need vim version 7.2 for this version of netrw" | echohl None
  finish
diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim
index b0a4d0b..197ab35 100644
--- a/runtime/plugin/tarPlugin.vim
+++ b/runtime/plugin/tarPlugin.vim
@@ -14,7 +14,7 @@
 if &cp || exists("g:loaded_tarPlugin")
  finish
 endif
-let g:loaded_tarPlugin = "v26"
+let g:loaded_tarPlugin = "v27"
 let s:keepcpo          = &cpo
 set cpo&vim
 
diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim
index 8e38107..3c7d775 100644
--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim plugin for converting a syntax highlighted file to HTML.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 Apr 09
+" Last Change: 2011 May 26
 "
 " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
 " $VIMRUNTIME/syntax/2html.vim
@@ -26,56 +26,61 @@
 "     buffer before we're done (5000 or so lines should do it)
 "   * TODO comments for code cleanup scattered throughout
 "
-"
-" Changelog:
-"   7.3_v9 (this version): Add html_pre_wrap option active with html_use_css and
-"                          without html_no_pre, default value same as 'wrap'
-"                          option, (Andy Spencer). Don't use 'fileencoding' for
-"                          converted document encoding if 'buftype' indicates a
-"                          special buffer which isn't written.
-"   7.3_v8 (85c5a72551e2): Add html_expand_tabs option to allow leaving tab
-"                          characters in generated output (Andy Spencer). Escape
-"                          text that looks like a modeline so Vim doesn't use
-"                          anything in the converted HTML as a modeline.
-"                          Bugfixes: Fix folding when a fold starts before the
-"                          conversion range. Remove fold column when there are
-"                          no folds.
-"   7.3_v7 (840c3cadb842): see betas released on vim_dev below:
-"                7.3_v7b3: Fixed bug, convert Unicode to UTF-8 all the way.
-"                7.3_v7b2: Remove automatic detection of encodings that are not
-"                          supported by all major browsers according to
-"                          http://wiki.whatwg.org/wiki/Web_Encodings and convert
-"                          to UTF-8 for all Unicode encodings. Make HTML
-"                          encoding to Vim encoding detection be
-"                          case-insensitive for built-in pairs.
-"                7.3_v7b1: Remove use of setwinvar() function which cannot be
-"                          called in restricted mode (Andy Spencer). Use
-"                          'fencoding' instead of 'encoding' to determine by
-"                          charset, and make sure the 'fenc' of the generated
-"                          file matches its indicated charset. Add charsets for
-"                          all of Vim's natively supported encodings.
-"   7.3_v6 (0d3f0e3d289b): Really fix bug with 'nowrapscan', 'magic' and other
-"                          user settings interfering with diff mode generation,
-"                          trailing whitespace (e.g. line number column) when
-"                          using html_no_pre, and bugs when using
-"                          html_hover_unfold.
-"   7.3_v5 ( unreleased ): Fix bug with 'nowrapscan' and also with out-of-sync
-"                          folds in diff mode when first line was folded.
-"   7.3_v4 (7e008c174cc3): Bugfixes, especially for xhtml markup, and diff mode.
-"   7.3_v3 (a29075150aee): Refactor option handling and make html_use_css
-"                          default to true when not set to anything. Use strict
-"                          doctypes where possible. Rename use_xhtml option to
-"                          html_use_xhtml for consistency. Use .xhtml extension
-"                          when using this option. Add meta tag for settings.
-"   7.3_v2 (80229a724a11): Fix syntax highlighting in diff mode to use both the
-"                          diff colors and the normal syntax colors
-"   7.3_v1 (e7751177126b): Add conceal support and meta tags in output
-"   Pre-v1 baseline: Mercurial changeset 3c9324c0800e
 
 if exists('g:loaded_2html_plugin')
   finish
 endif
-let g:loaded_2html_plugin = 'vim7.3_v9'
+let g:loaded_2html_plugin = 'vim7.3_v10'
+
+"
+" Changelog:
+"   7.3_v10 (this version): Fix error E684 when converting a range wholly inside
+"                           multiple nested folds with dynamic folding on.
+"                           Also fix problem with foldtext in this situation.
+"   7.3_v9  (0877b8d6370e): Add html_pre_wrap option active with html_use_css
+"                           and without html_no_pre, default value same as
+"                           'wrap' option, (Andy Spencer). Don't use
+"                           'fileencoding' for converted document encoding if
+"                           'buftype' indicates a special buffer which isn't
+"                           written.
+"   7.3_v8  (85c5a72551e2): Add html_expand_tabs option to allow leaving tab
+"                           characters in generated output (Andy Spencer).
+"                           Escape text that looks like a modeline so Vim
+"                           doesn't use anything in the converted HTML as a
+"                           modeline. Bugfixes: Fix folding when a fold starts
+"                           before the conversion range. Remove fold column when
+"                           there are no folds.
+"   7.3_v7  (840c3cadb842): see betas released on vim_dev below:
+"                 7.3_v7b3: Fixed bug, convert Unicode to UTF-8 all the way.
+"                 7.3_v7b2: Remove automatic detection of encodings that are not
+"                           supported by all major browsers according to
+"                           http://wiki.whatwg.org/wiki/Web_Encodings and
+"                           convert to UTF-8 for all Unicode encodings. Make
+"                           HTML encoding to Vim encoding detection be
+"                           case-insensitive for built-in pairs.
+"                 7.3_v7b1: Remove use of setwinvar() function which cannot be
+"                           called in restricted mode (Andy Spencer). Use
+"                           'fencoding' instead of 'encoding' to determine by
+"                           charset, and make sure the 'fenc' of the generated
+"                           file matches its indicated charset. Add charsets for
+"                           all of Vim's natively supported encodings.
+"   7.3_v6  (0d3f0e3d289b): Really fix bug with 'nowrapscan', 'magic' and other
+"                           user settings interfering with diff mode generation,
+"                           trailing whitespace (e.g. line number column) when
+"                           using html_no_pre, and bugs when using
+"                           html_hover_unfold.
+"   7.3_v5  ( unreleased ): Fix bug with 'nowrapscan' and also with out-of-sync
+"                           folds in diff mode when first line was folded.
+"   7.3_v4  (7e008c174cc3): Bugfixes, especially for xhtml markup, and diff mode
+"   7.3_v3  (a29075150aee): Refactor option handling and make html_use_css
+"                           default to true when not set to anything. Use strict
+"                           doctypes where possible. Rename use_xhtml option to
+"                           html_use_xhtml for consistency. Use .xhtml extension
+"                           when using this option. Add meta tag for settings.
+"   7.3_v2  (80229a724a11): Fix syntax highlighting in diff mode to use both the
+"                           diff colors and the normal syntax colors
+"   7.3_v1  (e7751177126b): Add conceal support and meta tags in output
+"   Pre-v1 baseline: Mercurial changeset 3c9324c0800e
 
 " Define the :TOhtml command when:
 " - 'compatible' is not set
diff --git a/runtime/plugin/vimballPlugin.vim b/runtime/plugin/vimballPlugin.vim
index c5acc7c..cb2b147 100644
--- a/runtime/plugin/vimballPlugin.vim
+++ b/runtime/plugin/vimballPlugin.vim
@@ -16,18 +16,22 @@
 if &cp || exists("g:loaded_vimballPlugin")
  finish
 endif
-let g:loaded_vimballPlugin = "v31"
+let g:loaded_vimballPlugin = "v33"
 let s:keepcpo              = &cpo
 set cpo&vim
 
 " ------------------------------------------------------------------------------
 " Public Interface: {{{1
-com! -ra   -complete=file -na=+ -bang MkVimball call vimball#MkVimball(<line1>,<line2>,<bang>0,<f-args>)
-com! -na=? -complete=dir  UseVimball			call vimball#Vimball(1,<f-args>)
-com! -na=0                VimballList			call vimball#Vimball(0)
-com! -na=* -complete=dir  RmVimball				call vimball#SaveSettings()|call vimball#RmVimball(<f-args>)|call vimball#RestoreSettings()
-au SourceCmd  *.vba.gz,*.vba.bz2,*.vba.zip		call vimball#Decompress(expand("<amatch>"))|call vimball#Vimball(1)
-au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.zip	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'| setlocal ma ff=unix noma |endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
+com! -ra   -complete=file -na=+ -bang MkVimball				call vimball#MkVimball(<line1>,<line2>,<bang>0,<f-args>)
+com! -na=? -complete=dir  UseVimball						call vimball#Vimball(1,<f-args>)
+com! -na=0                VimballList						call vimball#Vimball(0)
+com! -na=* -complete=dir  RmVimball							call vimball#SaveSettings()|call vimball#RmVimball(<f-args>)|call vimball#RestoreSettings()
+au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
+au SourceCmd *.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz			if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if expand("%")!=expand("<afile>")|close|endif
+au SourceCmd *.vba											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
+au BufEnter  *.vmb,*.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
+au SourceCmd *.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz			if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if expand("%")!=expand("<afile>")|close|endif
+au SourceCmd *.vmb											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
 
 " =====================================================================
 " Restoration And Modelines: {{{1
diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim
index ff3825e..a5e1ae4 100644
--- a/runtime/plugin/zipPlugin.vim
+++ b/runtime/plugin/zipPlugin.vim
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_zipPlugin")
  finish
 endif
-let g:loaded_zipPlugin = "v23"
+let g:loaded_zipPlugin = "v24"
 let s:keepcpo          = &cpo
 set cpo&vim
 
@@ -40,7 +40,7 @@
   au FileWriteCmd zipfile:*/*	call zip#Write(expand("<amatch>"))
  endif
 
- au BufReadCmd   *.zip,*.jar,*.xpi,*.war,*.ear		call zip#Browse(expand("<amatch>"))
+ au BufReadCmd   *.zip,*.jar,*.xpi,*.war,*.ear,*.celzip		call zip#Browse(expand("<amatch>"))
 augroup END
 
 " ---------------------------------------------------------------------