From 0623c653101d31c703b55f6dc79c83cb1549af20 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Wed, 29 Jul 2009 16:12:44 +0200
Subject: [PATCH] Update runtime files

---
 runtime/doc/autocmd.txt       |   4 +-
 runtime/doc/cmdline.txt       |  11 +-
 runtime/doc/debug.txt         |  25 ++-
 runtime/doc/diff.txt          |   4 +-
 runtime/doc/eval.txt          |   4 +-
 runtime/doc/ft_sql.txt        |   2 +-
 runtime/doc/if_cscop.txt      |   9 +-
 runtime/doc/insert.txt        |  15 +-
 runtime/doc/pi_getscript.txt  |   8 +-
 runtime/doc/pi_netrw.txt      |  12 +-
 runtime/doc/quotes.txt        |   2 +-
 runtime/doc/syntax.txt        |  40 ++++-
 runtime/doc/tags              |   4 +
 runtime/doc/todo.txt          |  66 ++++----
 runtime/doc/usr_25.txt        |   4 +-
 runtime/doc/usr_31.txt        |   2 +-
 runtime/doc/various.txt       |   5 +-
 runtime/filetype.vim          |   6 +-
 runtime/getdos.aap            |  53 +++---
 runtime/getunix.aap           |  53 +++---
 runtime/keymap/dvorak.vim     |  82 ++++++++++
 runtime/syntax/2html.vim      | 367 +++++++++++++++++++++++++++++++++++++++---
 runtime/syntax/sshconfig.vim  |  78 +++++----
 runtime/syntax/sshdconfig.vim | 115 ++++++-------
 runtime/syntax/taskdata.vim   |  43 +++++
 runtime/syntax/taskedit.vim   |  35 ++++
 runtime/syntax/xml.vim        |   8 +-
 27 files changed, 815 insertions(+), 242 deletions(-)
 create mode 100644 runtime/keymap/dvorak.vim
 create mode 100644 runtime/syntax/taskdata.vim
 create mode 100644 runtime/syntax/taskedit.vim

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 4d55296d..0bb98f0b 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.2.  Last change: 2009 Jun 24
+*autocmd.txt*   For Vim version 7.2.  Last change: 2009 Jul 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -551,7 +551,7 @@ FileChangedShell		When Vim notices that the modification time of
 				buffer that was changed "<afile>".
 				NOTE: The commands must not change the current
 				buffer, jump to another buffer or delete a
-				buffer.  *E246*
+				buffer.  *E246* *E811*
 				NOTE: This event never nests, to avoid an
 				endless loop.  This means that while executing
 				commands for the FileChangedShell event no
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 5d81762f..acbaeafc 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.2.  Last change: 2009 Apr 12
+*cmdline.txt*   For Vim version 7.2.  Last change: 2009 Jul 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -439,13 +439,20 @@ between files with almost the same name.  If there are multiple matches,
 those files with an extension that is in the 'suffixes' option are ignored.
 The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
 in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
-It is impossible to ignore suffixes with two dots.  Examples:
+
+An empty entry, two consecutive commas, match a file name that does not
+contain a ".", thus has no suffix.  This is useful to ignore "prog" and prefer
+"prog.c".
+
+Examples:
 
   pattern:	files:				match:	~
    test*	test.c test.h test.o		test.c
    test*	test.h test.o			test.h and test.o
    test*	test.i test.h test.c		test.i and test.c
 
+It is impossible to ignore suffixes with two dots.
+
 If there is more than one matching file (after ignoring the ones matching
 the 'suffixes' option) the first file name is inserted.  You can see that
 there is only one match when you type 'wildchar' twice and the completed
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index 44c9f9f1..654d89b5 100644
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.2.  Last change: 2006 May 01
+*debug.txt*     For Vim version 7.2.  Last change: 2009 Jul 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -10,7 +10,8 @@ This is for debugging Vim itself, when it doesn't work properly.
 For debugging Vim scripts, functions, etc. see |debug-scripts|
 
 1. Location of a crash, using gcc and gdb	|debug-gcc|
-2. Windows Bug Reporting			|debug-win32|
+2. Locating memory leaks			|debug-leaks|
+3. Windows Bug Reporting			|debug-win32|
 
 ==============================================================================
 
@@ -38,7 +39,25 @@ This also applies when using the MingW tools.
 
 ==============================================================================
 
-2. Windows Bug Reporting				*debug-win32*
+2. Locating memory leaks				*debug-leaks*
+
+If you suspect Vim is leaking memory and you are using Linux, the valgrind
+tool is very useful to pinpoint memory leaks.
+
+First of all, build Vim with EXITFREE defined.  Search for this in MAKEFILE
+and uncomment the line.
+
+Use this command to start Vim:				*valgrind*
+>
+	valgrind --log-file=valgrind.log ./vim
+
+Note: Vim will run much slower.  If your .vimrc is big or you have several
+plugins you need to be patient for startup, or run with the "-u NONE"
+argument.
+
+==============================================================================
+
+3. Windows Bug Reporting				*debug-win32*
 
 If the Windows version of Vim crashes in a reproducible manner, you can take
 some steps to provide a useful bug report.
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 4d279a4e..bf73db48 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.2.  Last change: 2009 Mar 06
+*diff.txt*      For Vim version 7.2.  Last change: 2009 Jul 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -94,7 +94,7 @@ While already in Vim you can start diff mode in three ways.
 :diffthis	Make the current window part of the diff windows.  This sets
 		the options like for "vimdiff".
 
-:diffpatch {patchfile}					*:diffp* *:diffpatch*
+:diffpatch {patchfile}				 *E816* *:diffp* *:diffpatch*
 		Use the current buffer, patch it with the diff found in
 		{patchfile} and open a buffer on the result.  The options are
 		set as for "vimdiff".
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c06fd3c5..915ec3a6 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.2.  Last change: 2009 May 17
+*eval.txt*	For Vim version 7.2.  Last change: 2009 Jul 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7844,7 +7844,7 @@ a "E600: Missing :endtry" error message is given, see |except-single-line|.
 
 Printing in Binary ~
 >
-  :" The function Nr2Bin() returns the Hex string of a number.
+  :" The function Nr2Bin() returns the binary string representation of a number.
   :func Nr2Bin(nr)
   :  let n = a:nr
   :  let r = ""
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index 893a9c35..9ffb0b7b 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -420,7 +420,7 @@ the space bar):
 			      of columns, you can press <C-Left>, this will
 			      replace the column list with the list of tables.
 			    - This allows you to quickly drill down into a
-			      table to view it's columns and back again.
+			      table to view its columns and back again.
 
 The SQL completion plugin caches various lists that are displayed in
 the popup window.  This makes the re-displaying of these lists very
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 94d39782..3d98e4a1 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -355,13 +355,8 @@ cscope version for Win32 see:
 The DJGPP-built version from http://cscope.sourceforge.net is known to not
 work with Vim.
 
-There are a couple of hard-coded limitations:
-
-    1. The maximum number of cscope connections allowed is 8.  Do you
-    really need more?
-
-    2. Doing a |:tjump| when |:cstag| searches the tag files is not
-    configurable (e.g., you can't do a tselect instead).
+Hard-coded limitation: doing a |:tjump| when |:cstag| searches the tag files
+is not configurable (e.g., you can't do a tselect instead).
 
 ==============================================================================
 6. Suggested usage					*cscope-suggestions*
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index d94d3cf5..61360a4a 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.2.  Last change: 2009 May 06
+*insert.txt*    For Vim version 7.2.  Last change: 2009 Jul 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1492,7 +1492,7 @@ with data pulled directly from within a database.  For detailed instructions
 and a tutorial see |omni-sql-completion|.
 
 The SQL completion plugin can be used in conjunction with other completion
-plugins.  For example, the PHP filetype has it's own completion plugin.
+plugins.  For example, the PHP filetype has its own completion plugin.
 Since PHP is often used to generate dynamic website by accessing a database,
 the SQL completion plugin can also be enabled.  This allows you to complete
 PHP code and SQL code at the same time.
@@ -1729,14 +1729,9 @@ too long when appending characters a line break is automatically inserted.
 These two commands will keep on asking for lines, until you type a line
 containing only a ".".  Watch out for lines starting with a backslash, see
 |line-continuation|.
-When these commands are used with |:global| or |:vglobal| then the lines are
-obtained from the text following the command.  Separate lines with a NL
-escaped with a backslash: >
-	:global/abc/insert\
-	one line\
-	another line
-The final "." is not needed then.
-NOTE: ":append" and ":insert" don't work properly in between ":if" and
+
+NOTE: These commands cannot be used with |:global| or |:vglobal|.
+":append" and ":insert" don't work properly in between ":if" and
 ":endif", ":for" and ":endfor", ":while" and ":endwhile".
 
 							*:start* *:startinsert*
diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt
index 3ac15692..c434ec55 100644
--- a/runtime/doc/pi_getscript.txt
+++ b/runtime/doc/pi_getscript.txt
@@ -76,7 +76,7 @@ Your computer needs to have wget for GetLatestVimScripts to do its work.
 ==============================================================================
 3. GetLatestVimScripts Usage				*glvs-usage* *:GLVS*
 
-Unless its been defined elsewhere, >
+Unless it's been defined elsewhere, >
 	:GLVS
 will invoke GetLatestVimScripts().  If some other plugin has defined that
 command, then you may type
@@ -136,7 +136,7 @@ insures that GetLatestVimScripts will assume that the script it has is
 out-of-date.
 
 The SourceID is extracted by GetLatestVimScripts from the script's page on
-vim.sf.net; whenever its greater than the one stored in the
+vim.sf.net; whenever it's greater than the one stored in the
 GetLatestVimScripts.dat file, the script will be downloaded
 (see |GetLatestVimScripts_dat|).
 
@@ -194,7 +194,7 @@ If your command is auto-installable (see |glvs-autoinstall|), and most scripts
 are, then you may include :AutoInstall: at the start of "yourscriptname".
 
 GetLatestVimScripts commands for those scripts are then appended, if not
-already present, to the user's GetLatest/GetLatestVimScripts.dat file.  Its a
+already present, to the user's GetLatest/GetLatestVimScripts.dat file.  It's a
 relatively painless way to automate the acquisition of any scripts your
 plugins depend upon.
 
@@ -337,7 +337,7 @@ The AutoInstall process will:
 
 v31 Jun 29, 2008 : * (Bill McCarthy) fixed having hls enabled with getscript
 v30 Jun 13, 2008 : * GLVS now checks for existence of fnameescape() and will
-		     issue an error message if its not supported
+		     issue an error message if it's not supported
 v29 Jan 07, 2008 : * Bram M pointed out that cpo is a global option and that
                      getscriptPlugin.vim was setting it but not restoring it.
 v28 Jan 02, 2008 : * improved shell quoting character handling, cygwin
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 362731cd..428baf8d 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -260,7 +260,7 @@ DIRECTORY LISTING					*netrw-dirlist* {{{2
 		:e ftp://[user]@hostname/path/
 <
 	For remote directories (ie. those using scp or ftp), that trailing
-	"/" is necessary (it tells netrw that its to treat it as a directory
+	"/" is necessary (it tells netrw that it's to treat it as a directory
 	to browse instead of a file to download).
 
 	However, the Nread command can also be used to accomplish this:
@@ -854,7 +854,7 @@ where [protocol] is typically scp or ftp.  As an example, try: >
 
 	vim ftp://ftp.home.vim.org/pub/vim/
 <
-For local directories, the trailing slash is not required.  Again, because its
+For local directories, the trailing slash is not required.  Again, because it's
 easy to miss: to browse remote directories, the url must terminate with a
 slash!
 
@@ -1342,7 +1342,7 @@ windows should have.
 :Rexplore  This command is a little different from the others.  When one
            edits a file, for example by pressing <cr> when atop a file in
 	   a netrw browser window, :Rexplore will return the display to
-	   that of the last netrw browser window.  Its a command version
+	   that of the last netrw browser window.  It's a command version
 	   of <2-leftmouse> (which is only available under gvim and
 	   cooperative terms).
 
@@ -1778,7 +1778,7 @@ MARKED FILES: TAGGING						*netrw-mT* {{{2
 	    (See |netrw-mf| and |netrw-mr| for how to mark files)
 		      (uses the global marked file list)
 
-The "mt" mapping will apply the command in |g:netrw_ctags| (by default, its
+The "mt" mapping will apply the command in |g:netrw_ctags| (by default, it's
 "ctags") to marked files.  For remote browsing, in order to create a tags file
 netrw will use ssh (see |g:netrw_ssh_cmd|), and so ssh must be available for
 this to work on remote systems.  For your local system, see |ctags| on how to
@@ -2739,7 +2739,7 @@ which is loaded automatically at startup (assuming :set nocp).
 			   * executable files now displayed with trailing (*)
 			   * symbolically linked files now displayed with
 			     trailing (@)
-			   * Somewhen, s:NetrwMarkFileMove() got damaged.  Its
+			   * Somewhen, s:NetrwMarkFileMove() got damaged.  It's
 			     now restored (missing an endif, for example).
 			   * |netrw-mu| implemented (unmarking marked files)
 			   * many bugs have been removed from the marked file
@@ -2811,7 +2811,7 @@ which is loaded automatically at startup (assuming :set nocp).
 			     the end of the s:NetrwBrowseChgDir() function;
 			     they're now at the end of every if..elseif..else
 			     block.  The edit-a-file one is not quite at the end
-			     of its block; instead, its just before the edit.
+			     of its block; instead, it's just before the edit.
 			     Restores user options, then this new placement
 			     allows ftplugins, autocmds, etc to change settings
 			     (ex. ftplugin/cpp.vim sets cindent).
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
index 98d43574..e6f21120 100644
--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
@@ -247,7 +247,7 @@ transition - as an Editor it is so much better in many ways: keyboard layout,
 memory usage, text alteration to name 3.  (Mark Adam)
 
 In fact, now if I want to know what a particular setting does in vi, I fire up
-VIM and check out it's help!  (Nikhil Patel, USA)
+VIM and check out its help!  (Nikhil Patel, USA)
 
 As a vi user, VIM has made working with text a far more pleasant task than
 before I encountered this program.  (Steinar Knutsen, Norway)
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 0c814d7a..5dcf1eb9 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.2.  Last change: 2009 May 22
+*syntax.txt*	For Vim version 7.2.  Last change: 2009 Jul 14
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -405,15 +405,45 @@ Force to omit the line numbers by using a zero value: >
 Go back to the default to use 'number' by deleting the variable: >
    :unlet html_number_lines
 
-Closed folds are put in the HTML as they are displayed.  If you don't want
-this, use the |zR| command before invoking 2html, or use: >
-   :let html_ignore_folding = 1
-
 By default, HTML optimized for old browsers is generated.  If you prefer using
 cascading style sheets (CSS1) for the attributes (resulting in considerably
 shorter and valid HTML 4 file), use: >
    :let html_use_css = 1
 
+Closed folds are put in the HTML as they are displayed.  If you don't want
+this, use the |zR| command before invoking 2html, or use: >
+   :let html_ignore_folding = 1
+
+You may want to generate HTML that includes all the data within the folds, and
+allow the user to view the folded data similar to how they would in Vim. To
+generate this dynamic fold information, use: >
+   :let html_dynamic_folds = 1
+
+Using html_dynamic_folds will imply html_use_css, because it would be far too
+difficult to do it for old browsers. However, html_ignore_folding overrides
+html_dynamic_folds.
+
+Using html_dynamic_folds will default to generating a foldcolumn in the html
+similar to Vim's foldcolumn, that will use javascript to open and close the
+folds in the HTML document. The width of this foldcolumn starts at the current
+setting of |'foldcolumn'| but grows to fit the greatest foldlevel in your
+document. If you do not want to show a foldcolumn at all, use: >
+   :let html_no_foldcolumn = 1
+
+Using this option, there will be no foldcolumn available to open the folds in
+the HTML. For this reason, another option is provided: html_hover_unfold.
+Enabling this option will use CSS 2.0 to allow a user to open a fold by
+hovering the mouse pointer over it. Note that old browsers (notably Internet
+Explorer 6) will not support this feature.  Browser-specific markup for IE6 is
+included to fall back to the normal CSS1 code so that the folds show up
+correctly for this browser, but they will not be openable without a
+foldcolumn. Note that using html_hover_unfold will allow modern browsers with
+disabled javascript to view closed folds. To use this option, use: >
+   :let html_hover_unfold = 1
+
+Setting html_no_foldcolumn with html_dynamic_folds will automatically set
+html_hover_unfold, because otherwise the folds wouldn't be dynamic.
+
 By default "<pre>" and "</pre>" is used around the text.  This makes it show
 up as you see it in Vim, but without wrapping.	If you prefer wrapping, at the
 risk of making some things look a bit different, use: >
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 090f5a25..60400628 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4112,10 +4112,12 @@ E808	eval.txt	/*E808*
 E809	cmdline.txt	/*E809*
 E81	map.txt	/*E81*
 E810	diff.txt	/*E810*
+E811	autocmd.txt	/*E811*
 E812	autocmd.txt	/*E812*
 E813	editing.txt	/*E813*
 E814	editing.txt	/*E814*
 E815	if_mzsch.txt	/*E815*
+E816	diff.txt	/*E816*
 E82	message.txt	/*E82*
 E83	message.txt	/*E83*
 E84	windows.txt	/*E84*
@@ -5041,6 +5043,7 @@ daw	motion.txt	/*daw*
 dd	change.txt	/*dd*
 debug-gcc	debug.txt	/*debug-gcc*
 debug-highlight	debugger.txt	/*debug-highlight*
+debug-leaks	debug.txt	/*debug-leaks*
 debug-minidump	debug.txt	/*debug-minidump*
 debug-mode	repeat.txt	/*debug-mode*
 debug-scripts	repeat.txt	/*debug-scripts*
@@ -7986,6 +7989,7 @@ v_x	change.txt	/*v_x*
 v_y	change.txt	/*v_y*
 v_~	change.txt	/*v_~*
 val-variable	eval.txt	/*val-variable*
+valgrind	debug.txt	/*valgrind*
 values()	eval.txt	/*values()*
 variables	eval.txt	/*variables*
 various	various.txt	/*various*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index f8bbf444..ae0eae66 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.2.  Last change: 2009 Jul 02
+*todo.txt*      For Vim version 7.2.  Last change: 2009 Jul 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,36 +30,26 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Still a problem with ":make" in the wrong directory.  Caused by ":bufdo".
-(Ajit Thakkar, 2009 Jul 1)
-
-Increase number of cscope connectsions from 8 to 42? (Robert Bragg, 2009 Apr
-20)  Patch by Dominique Pelle, 2009 Apr 26.
-
-Screen redrawn only after delay. (Raulnac, 2009 May 28)
-
-Patch for Ruby support on Mac. (Bjorn Winckler, 2009 June 19)
-
-Use cppcheck to find unused functions?
-
-Dynamic Folding support for 2html.vim. (Benjamin Fritz, 2009 Feb 12)
-
-Crash in syntax HL code with jquery syntax. (George Reilly, 2009 Mar 24)
-
-Typo fixes for help files. (Dominique Pelle, 2009 May 7, 2nd one)
-
-Crash with completefunc(). (Ingo Karkat, 2009 Jun 13)
-Stack trace by Dominique Pelle.
+When 'enc' is utf-8 and 'fenc' is latin1 and there is a non-latin1 char get an
+error without a hint what causes the problem.
 
 Conversion problem: When 'encoding' is "utf-16" and 'fenc' is "utf-8" writing
 a file does conversion while none is to be done. (Yukihiro Nakadaira)
 Also: when 'fenc' is empty file is written as utf-8 instead of utf-16.
 Also updated docs for 'fileencoding' about not doing conversion.
 
+Update for Matlab syntax file. (Maurizio Tranchero, 2009 July 25)
+
+Updated debian runtime files (James Vega, 2009 July 25)
+
 ":help g" does not jump to index of commands starting with g.
 
+Patch to support :browse for more commands. (Lech Lorens, 2009 Jul 18)
+
 Windows (Vista): download spell file doesn't work? (Chris Bogen, 2009 May 7)
 
+Patches for Mzscheme interface (Sergey Khorev, 2009 Jul 17, 2 parts)
+
 In command line window ":close" doesn't work properly. (Tony Mechelynck, 2009
 Jun 1)
 
@@ -69,13 +59,34 @@ string value.
 
 Reproducable crash in syntax HL. (George Reilly, Dominique Pelle, 2009 May 9)
 
+submatch() may remove backslash. (Sergey Goldgaber, 2009 Jul 6)
+
+Still a problem with ":make" in the wrong directory.  Caused by ":bufdo".
+(Ajit Thakkar, 2009 Jul 1) More information Jul 9, Jul 15.
+Caused by "doautoall syntaxset BufEnter *" in syntax/nosyntax.vim ?
+There also is a BufLeave/BufEnter aucmd to save/restore view.
+Does the patch to save/restore globaldir work?
+
 Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
 Probably needs a bit of work.
 
+List of encoding aliases. (Takao Fujiware, 2009 Jul 18)
+Are they all OK?  Update Jul 22.
+
+Patch for Ruby sockets. (todesking/Ariya Mizutani, 2008 Jul 1,24)
+Confirmed by Anton Sharonov, 2008 Dec 26.
+
+Patch for Ruby 1.9. (Msaki Suketa, 2009 Jul 21)
+
+Patch for GTK resizing problem when maximized. (Vitaly Minko, 2009 Jul 22)
+
 Patch for completion of ":find" arguments. (Nazri Ramliy, 2009 Feb 22, 26)
 8   For ":find" and ":sfind" expand files found in 'path'.
 Update 2009 Mar 28.
 
+Setting 'tags' to "tagsdir/*" does not find "tagsdir/tags". (Steven K. Wong,
+2009 Jul 18)
+
 ":e dir<Tab>" with 'wildmode' set to "list" doesn't highlight directory names
 with a space. (Alexandre Provencio, 2009 Jun 9)
 
@@ -117,6 +128,9 @@ for GTK clipboard.  Avoid requirement for iconv.
 
 Now that colnr_T is int instead of unsigned, more type casts can be removed.
 
+'delcombine' does not work for the command line. (Tony Mechelynck, 2009 Jul
+20)
+
 Unwanted file name escaping: ":echo input('file:' , '', 'file')"
 And use file name completion on a file with spaces. (Frederic Hardy, 2009 Mar
 23)
@@ -274,6 +288,8 @@ doesn't. (John Little, 2008 Nov 9)
 Shell expansion returns unexpanded string?
 Don't use shell when "~" is not at the start?
 
+":unlet $VAR" doesn't work.
+
 When using ":e ++enc=foo file" and the file is already loaded with
 'fileencoding' set to "bar", then do_ecmd() uses that buffer, even though the
 fileencoding differs.  Reload the buffer in this situation?  Need to check for
@@ -321,7 +337,7 @@ put_in_typebuf().  Char mapped twice?
 
 Patch for colorscheme submenu. (Juergen Kraemer, 2008 Aug 20)
 
-Patch for Python 3 support. (Roland Puntaier, 2009 Jun 3)
+Patch for Python 3 support. (Roland Puntaier, 2009 Jun 3, update July 15)
 Needs to be tested.
 
 8   Some file systems are case-sensitive, some are not.  Turn
@@ -383,9 +399,6 @@ line doesn't fit. (Dasn, 2008 May 1)
 GUI: In Normal mode can't yank the modeless selection.  Make "gy" do this?
 Works like CTRL-Y in Command line mode.
 
-Patch for Ruby sockets. (todesking/Ariya Mizutani, 2008 Jul 1,24)
-Confirmed by Anton Sharonov, 2008 Dec 26.
-
 Mac: Move Carbon todo items to os_mac.txt.  Note that this version is frozen,
 try the Cocoa version.
 
@@ -3194,7 +3207,7 @@ Autocommands:
     WinClose	    - Just before closing a window
 -   Write the file now and then ('autosave'):
 				  *'autosave'* *'as'* *'noautosave'* *'noas'*
-    'autosave' 'aw' number  (default 0)
+    'autosave' 'as' number  (default 0)
 	    Automatically write the current buffer to file N seconds after the
 	    last change has been made and when |'modified'| is still set.
 	    Default: 0 = do not autosave the buffer.
@@ -4284,7 +4297,6 @@ Various improvements:
     etc.  Combinations of Alt, Ctrl and Shift are also possible.  Recognize
     these to avoid inserting the raw byte sequence, handle like the key
     without modifier (unless mapped).
-7   Support ":browse edit" in console, using explorer.vim?
 6   Add "gG": like what "gj" is to "j": go to the N'th window line.
 8   Add command like ":normal" that accepts <Key> notation like ":map".
 9   Support ACLs on more systems.
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index 88505da3..088ad2ef 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -304,7 +304,7 @@ want to enable one, use the following command: >
 One horizontal scrollbar will appear at the bottom of the Vim window.
 
 If you don't have a scrollbar or don't want to use it, use these commands to
-scroll the text.  The cursor will stay in the same place, but it's move back
+scroll the text.  The cursor will stay in the same place, but it's moved back
 into the visible text if necessary.
 
 	zh		scroll right
@@ -547,7 +547,7 @@ The layout is messed up.  To avoid that, use the "gr" command:
 What happens is that the "gr" command makes sure the new character takes the
 right amount of screen space.  Extra spaces or tabs are inserted to fill the
 gap.  Thus what actually happens is that a tab is replaced by "x" and then
-blanks added to make the text after it keep it's place.  In this case a
+blanks added to make the text after it keep its place.  In this case a
 tab is inserted.
    When you need to replace more than one character, you use the "R" command
 to go to Replace mode (see |04.9|).  This messes up the layout and replaces
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
index ff3dfbcc..22ba60f8 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -245,7 +245,7 @@ you can set the 'lines' option to set a different window size: >
 
 	:set lines=55
 
-You don't want to do this in a terminal, since it's size is fixed (except for
+You don't want to do this in a terminal, since its size is fixed (except for
 an xterm that supports resizing).
    The gvimrc file is searched for in the same locations as the vimrc file.
 Normally its name is "~/.gvimrc" for Unix and "$VIM/_gvimrc" for MS-Windows.
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 63b32e92..18837b64 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.2.  Last change: 2009 Jul 01
+*various.txt*   For Vim version 7.2.  Last change: 2009 Jul 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -509,8 +509,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 			to avoid that: ":silent menu .... :silent command".
 
 						*:uns* *:unsilent*
-:uns[ilent] {command}
-			Execute {command} not silently.  Only makes a
+:uns[ilent] {command}	Execute {command} not silently.  Only makes a
 			difference when |:silent| was used to get to this
 			command.
 			Use this for giving a message even when |:silent| was
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 49bc5f80..4915c58e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2009 Jun 13
+" Last Change:	2009 Jul 09
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1966,6 +1966,10 @@ au BufNewFile,BufRead tags			setf tags
 " TAK
 au BufNewFile,BufRead *.tak			setf tak
 
+" Task
+au BufRead,BufNewFile {pending,completed,undo}.data  setf taskdata
+au BufRead,BufNewFile *.task                    setf taskedit
+
 " Tcl (JACL too)
 au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl	setf tcl
 
diff --git a/runtime/getdos.aap b/runtime/getdos.aap
index ff74f0eb..eff347bc 100644
--- a/runtime/getdos.aap
+++ b/runtime/getdos.aap
@@ -31,7 +31,7 @@ all fetch:
   @if get_md5(file) != "0d7440dc33cdc54af5747868bfcaf218":
     :fetch {fetch = $fetcha} $file
   file = doc/syntax.txt
-  @if get_md5(file) != "490ba3d7006eb22ac03875e438aa15da":
+  @if get_md5(file) != "c316eb59b49fd3da5b3c7ac870530ac6":
     :fetch {fetch = $fetcha} $file
   file = doc/os_390.txt
   @if get_md5(file) != "8cfd5fccda5b1613ab12f0db99708e03":
@@ -91,13 +91,13 @@ all fetch:
   @if get_md5(file) != "3d5a39a7d17db4a981829fc266c15f31":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_31.txt
-  @if get_md5(file) != "5c448ce5087d51c1d3a85ffcf2c67840":
+  @if get_md5(file) != "1b9855a44b9feb444d792c59bd7f7edb":
     :fetch {fetch = $fetcha} $file
   file = doc/todo.txt
-  @if get_md5(file) != "34885c08de7543c30475be554c7a8983":
+  @if get_md5(file) != "912da07cde3d1aec9f88f15f5a7d46de":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_25.txt
-  @if get_md5(file) != "d6129b1c1d902e3dfd3ca78d6256fd9c":
+  @if get_md5(file) != "f6b5a9c09cdedc9bce3216322a6cc68b":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_12.txt
   @if get_md5(file) != "690cf1152d7e2e2f1770ba978207ac40":
@@ -112,19 +112,19 @@ all fetch:
   @if get_md5(file) != "d3c46b60c831f019b768ef024738b9ab":
     :fetch {fetch = $fetcha} $file
   file = doc/pi_netrw.txt
-  @if get_md5(file) != "0cdf73e6b2a421eab60ea1b2042f4bc0":
+  @if get_md5(file) != "31bd166a411234e937961650213e16b9":
     :fetch {fetch = $fetcha} $file
   file = doc/if_mzsch.txt
   @if get_md5(file) != "282598c4010127e2182ac8e8842fdfb8":
     :fetch {fetch = $fetcha} $file
   file = doc/insert.txt
-  @if get_md5(file) != "f5173f6c30936cc15d73e122064f0fdf":
+  @if get_md5(file) != "957771bba17015788b0badcc1b82a003":
     :fetch {fetch = $fetcha} $file
   file = doc/farsi.txt
   @if get_md5(file) != "8ab94d4664373206a820b8416d61c5af":
     :fetch {fetch = $fetcha} $file
   file = doc/ft_sql.txt
-  @if get_md5(file) != "d04ce3bf5a9e9cdcdff6b011247fbaa8":
+  @if get_md5(file) != "e23f777384ca90e2644a9f45748adb62":
     :fetch {fetch = $fetcha} $file
   file = doc/os_msdos.txt
   @if get_md5(file) != "1d099f139a567a697eb15289aa4e9f67":
@@ -136,7 +136,7 @@ all fetch:
   @if get_md5(file) != "22ff4577aa52b2341df58f7879920760":
     :fetch {fetch = $fetcha} $file
   file = doc/eval.txt
-  @if get_md5(file) != "1f8861be04234375a6b075694e0b5d4f":
+  @if get_md5(file) != "166c99b72c13ae8b0893292702d1a37c":
     :fetch {fetch = $fetcha} $file
   file = doc/os_beos.txt
   @if get_md5(file) != "39cfffc1588db699e71c3826fe455482":
@@ -181,7 +181,7 @@ all fetch:
   @if get_md5(file) != "410181e4a90ddad5dd477750b5516bb1":
     :fetch {fetch = $fetcha} $file
   file = doc/diff.txt
-  @if get_md5(file) != "e66c2b5b2c2106f4f73c1eaa0b40122b":
+  @if get_md5(file) != "d5bd1bb36f4cde8f35a65c49f2839fe4":
     :fetch {fetch = $fetcha} $file
   file = doc/message.txt
   @if get_md5(file) != "800b5f90c54c504ea90e1765d4c2dd1e":
@@ -193,7 +193,7 @@ all fetch:
   @if get_md5(file) != "5725b2997ead18ed222557a2be69e177":
     :fetch {fetch = $fetcha} $file
   file = doc/quotes.txt
-  @if get_md5(file) != "05e54026730868a3232626c4b54e5b23":
+  @if get_md5(file) != "4157013f5afe36cd57a0ce25936c4e9b":
     :fetch {fetch = $fetcha} $file
   file = doc/os_win32.txt
   @if get_md5(file) != "52558eead9d8a77d67927fa469625047":
@@ -235,7 +235,7 @@ all fetch:
   @if get_md5(file) != "1cb3d2cb14456f847942fdbe83ae6bee":
     :fetch {fetch = $fetcha} $file
   file = doc/if_cscop.txt
-  @if get_md5(file) != "19fe417b92efa4478989394e3c7c7fd9":
+  @if get_md5(file) != "0eb4b1f21fe7c41e80701d9f8e2b8e81":
     :fetch {fetch = $fetcha} $file
   file = doc/if_ole.txt
   @if get_md5(file) != "37d066f34cb62cfb31346c4b8c0bb16b":
@@ -268,7 +268,7 @@ all fetch:
   @if get_md5(file) != "5fa27261a8a8696d844407d9d0de6654":
     :fetch {fetch = $fetcha} $file
   file = doc/cmdline.txt
-  @if get_md5(file) != "4dea947b8caf1a87cc06c7baced05d9d":
+  @if get_md5(file) != "5c3c67ffea6abde32fee079e64a83ab6":
     :fetch {fetch = $fetcha} $file
   file = doc/os_mint.txt
   @if get_md5(file) != "2b522067ea69df3ca73ed19e3bf83991":
@@ -322,7 +322,7 @@ all fetch:
   @if get_md5(file) != "c641b9d0d481c01856fd590c240ec6fd":
     :fetch {fetch = $fetcha} $file
   file = doc/pi_getscript.txt
-  @if get_md5(file) != "b64608103bbeb3bdcaa070c4389c2e71":
+  @if get_md5(file) != "fbdc5af7e241ad41ebabada81df334bd":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_24.txt
   @if get_md5(file) != "bc76dd81312c845766e7952ab25391bd":
@@ -352,13 +352,13 @@ all fetch:
   @if get_md5(file) != "e570c2b90a65a8adf1381e76704dab8e":
     :fetch {fetch = $fetcha} $file
   file = doc/debug.txt
-  @if get_md5(file) != "dbfacfe554801fa070077a2a6cd7cdb7":
+  @if get_md5(file) != "883c2f3bd5c6a38ebb88f8d2d33fd68e":
     :fetch {fetch = $fetcha} $file
   file = doc/mlang.txt
   @if get_md5(file) != "32d4044efe0ce4250b5bc50e646d0b92":
     :fetch {fetch = $fetcha} $file
   file = doc/various.txt
-  @if get_md5(file) != "a5959bb86356e2c0ad978f15228a2baa":
+  @if get_md5(file) != "7e9a009ac463196eadb702c49395aa84":
     :fetch {fetch = $fetcha} $file
   file = doc/uganda.txt
   @if get_md5(file) != "b639f685802cc8fc4091711f752bba72":
@@ -367,7 +367,7 @@ all fetch:
   @if get_md5(file) != "47b5561b58e6de0115ecea6228043cad":
     :fetch {fetch = $fetcha} $file
   file = doc/autocmd.txt
-  @if get_md5(file) != "edaf7af45b3615ad6426dd645bee79bc":
+  @if get_md5(file) != "31df962f79bada8f70e9e14fc9c8c977":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_06.txt
   @if get_md5(file) != "411e1e84bd81e760810d76fe320dacdc":
@@ -617,7 +617,7 @@ all fetch:
   @if get_md5(file) != "3d9818c34e8ee72d660e45b5f2281fe4":
     :fetch {fetch = $fetcha} $file
   file = filetype.vim
-  @if get_md5(file) != "a03b29878f9c1bd5999e1af34d96aa27":
+  @if get_md5(file) != "8b68763d6a7d6bd9de6170d3ef31e328":
     :fetch {fetch = $fetcha} $file
   file = scripts.vim
   @if get_md5(file) != "54ba1f512abd126a062d54cf0b70b392":
@@ -2130,6 +2130,9 @@ all fetch:
   file = syntax/icon.vim
   @if get_md5(file) != "4c87f3f23f2b421333ded6bf55793936":
     :fetch {fetch = $fetcha} $file
+  file = syntax/taskedit.vim
+  @if get_md5(file) != "e9c3b708c0779f72b5f953197a52af11":
+    :fetch {fetch = $fetcha} $file
   file = syntax/xkb.vim
   @if get_md5(file) != "97a7a167033caaf7a7db021967f2bfd2":
     :fetch {fetch = $fetcha} $file
@@ -2623,7 +2626,7 @@ all fetch:
   @if get_md5(file) != "e2e9601d54a3b080fae2b3c9ce02e1be":
     :fetch {fetch = $fetcha} $file
   file = syntax/sshconfig.vim
-  @if get_md5(file) != "531d45baf1896e5bccaa6228bb3fb9e8":
+  @if get_md5(file) != "8e1301a5e3d1bb413b6fdd988ab611ba":
     :fetch {fetch = $fetcha} $file
   file = syntax/hercules.vim
   @if get_md5(file) != "c25b527eafe750faae956ca8b0e24d8a":
@@ -2674,7 +2677,7 @@ all fetch:
   @if get_md5(file) != "dbca4966548645fc52eb220dde2bea5b":
     :fetch {fetch = $fetcha} $file
   file = syntax/xml.vim
-  @if get_md5(file) != "b313ae58ab68bbba10f2ede99e095d06":
+  @if get_md5(file) != "ac47aece56b47d0358e9cee1caa79d86":
     :fetch {fetch = $fetcha} $file
   file = syntax/tasm.vim
   @if get_md5(file) != "98af1ed27db49db4f83f49191fe124d8":
@@ -2853,6 +2856,9 @@ all fetch:
   file = syntax/ctrlh.vim
   @if get_md5(file) != "83afb895529083d7ad6d492e357f5075":
     :fetch {fetch = $fetcha} $file
+  file = syntax/taskdata.vim
+  @if get_md5(file) != "746c0cfe998458c086ef6f93f4bb6997":
+    :fetch {fetch = $fetcha} $file
   file = syntax/radiance.vim
   @if get_md5(file) != "35494dc095bd155b97bebdfa0eb45a7c":
     :fetch {fetch = $fetcha} $file
@@ -2965,7 +2971,7 @@ all fetch:
   @if get_md5(file) != "4f9a3221df6b9c5cc591dd2c2093ba29":
     :fetch {fetch = $fetcha} $file
   file = syntax/2html.vim
-  @if get_md5(file) != "f69203e158563eed36174a5886747224":
+  @if get_md5(file) != "af950ff277c7ce15e280f058772b5f4d":
     :fetch {fetch = $fetcha} $file
   file = syntax/ldif.vim
   @if get_md5(file) != "7fac5034e431020b5b997f66ef54a7b8":
@@ -3115,7 +3121,7 @@ all fetch:
   @if get_md5(file) != "ba3aaa3c006f9122554924c24c2428b8":
     :fetch {fetch = $fetcha} $file
   file = syntax/sshdconfig.vim
-  @if get_md5(file) != "d66e50f72809bbf601172fa35d86d733":
+  @if get_md5(file) != "174030304e7cf0388f7fc03b36f6baef":
     :fetch {fetch = $fetcha} $file
   file = syntax/resolv.vim
   @if get_md5(file) != "251a5afb45c90df50c6d3a72cde1e75c":
@@ -3860,6 +3866,9 @@ all fetch:
   file = keymap/magyar_utf-8.vim
   @if get_md5(file) != "a4a89ffb5b85803d158d4a725ed1b1c6":
     :fetch {fetch = $fetcha} $file
+  file = keymap/dvorak.vim
+  @if get_md5(file) != "90d216c530f0511e314573c5e678fd68":
+    :fetch {fetch = $fetcha} $file
   file = keymap/hebrewp_iso-8859-8.vim
   @if get_md5(file) != "1befaabbb7ce20aaaf62cd3e55bc866b":
     :fetch {fetch = $fetcha} $file
@@ -4225,7 +4234,7 @@ all fetch:
   @if get_md5(file) != "af0da03b5c998a8f8ed94a66763febd9":
     :fetch {fetch = $fetcha} $file
   file = doc/tags
-  @if get_md5(file) != "5dd2f9d13164a16ad7adc09fc4287776":
+  @if get_md5(file) != "82ba992f710a51c992a24928810e00b5":
     :fetch {fetch = $fetcha} $file
   :mkdir {f} print
   file = print/jis_roman.ps
diff --git a/runtime/getunix.aap b/runtime/getunix.aap
index de42193c..a0b236d3 100644
--- a/runtime/getunix.aap
+++ b/runtime/getunix.aap
@@ -31,7 +31,7 @@ all fetch:
   @if get_md5(file) != "3e1d23b59cd066a759b58c514c06eed8":
     :fetch {fetch = $fetcha} $file
   file = doc/syntax.txt
-  @if get_md5(file) != "82c0e65f6df589e8e831b2386955ac51":
+  @if get_md5(file) != "111ac26ed0bec5915be19ae39bad1e38":
     :fetch {fetch = $fetcha} $file
   file = doc/os_390.txt
   @if get_md5(file) != "50b1842731db424686ebf8609d17dd5a":
@@ -91,13 +91,13 @@ all fetch:
   @if get_md5(file) != "e9623f95ebd2fb37901534a71c124b9f":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_31.txt
-  @if get_md5(file) != "114ea17d1148bbd9f50ad4aaa8356e32":
+  @if get_md5(file) != "701bb75ecd83ea0588c89d4efc62b0ec":
     :fetch {fetch = $fetcha} $file
   file = doc/todo.txt
-  @if get_md5(file) != "d68f84662e84a343da0c2bd576164a5c":
+  @if get_md5(file) != "15f47e4ff8373e7d47bd768a132c2730":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_25.txt
-  @if get_md5(file) != "b3ffcdfbefd7fbfcc33d79f5954d1f49":
+  @if get_md5(file) != "525e8f47371e991590d1afcc5b1a1490":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_12.txt
   @if get_md5(file) != "03e1f1f24aee7c5c5a44320d728ecf57":
@@ -112,19 +112,19 @@ all fetch:
   @if get_md5(file) != "248a7f496274ff411301e843f0c991d7":
     :fetch {fetch = $fetcha} $file
   file = doc/pi_netrw.txt
-  @if get_md5(file) != "bc386db02206c02e775567ae53563feb":
+  @if get_md5(file) != "af45f38fa96e32fc201138e236aad684":
     :fetch {fetch = $fetcha} $file
   file = doc/if_mzsch.txt
   @if get_md5(file) != "74467b06036149f00b7e30165638645c":
     :fetch {fetch = $fetcha} $file
   file = doc/insert.txt
-  @if get_md5(file) != "8d0ec222e7826ac82ccbda7d24f3a951":
+  @if get_md5(file) != "83238dcb92e9f5bee817c7924cdd8a88":
     :fetch {fetch = $fetcha} $file
   file = doc/farsi.txt
   @if get_md5(file) != "db38a7ba0e74b07aed4e264e80934811":
     :fetch {fetch = $fetcha} $file
   file = doc/ft_sql.txt
-  @if get_md5(file) != "8953ad9b94f5a10cc61e28f7145c513b":
+  @if get_md5(file) != "62a86d5ac35e162f9522b06b02bcf096":
     :fetch {fetch = $fetcha} $file
   file = doc/os_msdos.txt
   @if get_md5(file) != "e392d0e269e0dc24de41900ccc206549":
@@ -136,7 +136,7 @@ all fetch:
   @if get_md5(file) != "c564aa21efc9a54eee203f47daab956f":
     :fetch {fetch = $fetcha} $file
   file = doc/eval.txt
-  @if get_md5(file) != "b5d0184988f92a6791873e1ab9f53bad":
+  @if get_md5(file) != "865663f89dadfd5c8e7d687c0adf35ce":
     :fetch {fetch = $fetcha} $file
   file = doc/os_beos.txt
   @if get_md5(file) != "21cbefe42c374a13c1eb541c4254d2a6":
@@ -181,7 +181,7 @@ all fetch:
   @if get_md5(file) != "b3114afe40a9835abb16021fdb754632":
     :fetch {fetch = $fetcha} $file
   file = doc/diff.txt
-  @if get_md5(file) != "07064d845319db4dd29a69724e0288f7":
+  @if get_md5(file) != "21cb1c1ee0e0ad15650c5fc6df76df37":
     :fetch {fetch = $fetcha} $file
   file = doc/message.txt
   @if get_md5(file) != "16800d26a7a54c49e0b6e5144ee11dce":
@@ -193,7 +193,7 @@ all fetch:
   @if get_md5(file) != "f7da421c97b440880df51e6a6234c033":
     :fetch {fetch = $fetcha} $file
   file = doc/quotes.txt
-  @if get_md5(file) != "e5832e5e98b4b6ee025cf53035436766":
+  @if get_md5(file) != "01d40321f8c8f4febbaf2be8ffab9467":
     :fetch {fetch = $fetcha} $file
   file = doc/os_win32.txt
   @if get_md5(file) != "15c4fdc0ab281326481b16782b877334":
@@ -235,7 +235,7 @@ all fetch:
   @if get_md5(file) != "87a58e2bbc61319173d50df56363b51d":
     :fetch {fetch = $fetcha} $file
   file = doc/if_cscop.txt
-  @if get_md5(file) != "91c5133993c66a2aa2f80f310aa2930b":
+  @if get_md5(file) != "9653efde1b3cd9b651d0afbd197365f3":
     :fetch {fetch = $fetcha} $file
   file = doc/if_ole.txt
   @if get_md5(file) != "de8f9059779ba1bc3e164a9888af6e55":
@@ -268,7 +268,7 @@ all fetch:
   @if get_md5(file) != "fcb01435557cdc480587cf32fe919ffb":
     :fetch {fetch = $fetcha} $file
   file = doc/cmdline.txt
-  @if get_md5(file) != "442fe153672257013fedf1ed795d3a0e":
+  @if get_md5(file) != "6e615bc130cbcc25c84ec12dd937e4fa":
     :fetch {fetch = $fetcha} $file
   file = doc/os_mint.txt
   @if get_md5(file) != "1a9bee087bf515d0704ac7af3c696560":
@@ -322,7 +322,7 @@ all fetch:
   @if get_md5(file) != "1d38b3d80a3db4e71059855c26915cdf":
     :fetch {fetch = $fetcha} $file
   file = doc/pi_getscript.txt
-  @if get_md5(file) != "93d67c85bb0885081107dfad01045f01":
+  @if get_md5(file) != "5644deb8826c1f7b3421aa88b07c5d13":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_24.txt
   @if get_md5(file) != "a9f897ebadd1d88dd7382b9d6cf33797":
@@ -352,13 +352,13 @@ all fetch:
   @if get_md5(file) != "3b20e550d6d484a16293ddc1382fbaa6":
     :fetch {fetch = $fetcha} $file
   file = doc/debug.txt
-  @if get_md5(file) != "31f1b99fce0505feafbc22a5dbebaca6":
+  @if get_md5(file) != "f0f155649beaaad7ac751477a6483128":
     :fetch {fetch = $fetcha} $file
   file = doc/mlang.txt
   @if get_md5(file) != "f6dacdc4fa7cbefef168510fd6e59795":
     :fetch {fetch = $fetcha} $file
   file = doc/various.txt
-  @if get_md5(file) != "0e920c14079a9de972214df20c1608f1":
+  @if get_md5(file) != "0e5a7dd1290787b8fb16b2fe6d05520c":
     :fetch {fetch = $fetcha} $file
   file = doc/uganda.txt
   @if get_md5(file) != "cd49910a3dde6fe0a7e24ebe8cbf7066":
@@ -367,7 +367,7 @@ all fetch:
   @if get_md5(file) != "edf35da5c8b17fdc90539b219e8359be":
     :fetch {fetch = $fetcha} $file
   file = doc/autocmd.txt
-  @if get_md5(file) != "8e4d62f5114d6f90a0ce549a5926291f":
+  @if get_md5(file) != "8e4b4b9d46042179037874e329b7f789":
     :fetch {fetch = $fetcha} $file
   file = doc/usr_06.txt
   @if get_md5(file) != "faad1e63fb58ec902d9d9fad360cc8ff":
@@ -617,7 +617,7 @@ all fetch:
   @if get_md5(file) != "dd9ffce89e3e18837f30792b74e44ffb":
     :fetch {fetch = $fetcha} $file
   file = filetype.vim
-  @if get_md5(file) != "ed4f6e76fde8f75465d9815260160983":
+  @if get_md5(file) != "0776518646917bc6254800697f268e52":
     :fetch {fetch = $fetcha} $file
   file = scripts.vim
   @if get_md5(file) != "87cda0e807a2b92e42cde1769e829c00":
@@ -2130,6 +2130,9 @@ all fetch:
   file = syntax/icon.vim
   @if get_md5(file) != "587b816037f336f31de4a9c0af722bc9":
     :fetch {fetch = $fetcha} $file
+  file = syntax/taskedit.vim
+  @if get_md5(file) != "edad0da4b2103d238bd1b4047231e314":
+    :fetch {fetch = $fetcha} $file
   file = syntax/xkb.vim
   @if get_md5(file) != "927ec6962519627df9296be76d19f426":
     :fetch {fetch = $fetcha} $file
@@ -2623,7 +2626,7 @@ all fetch:
   @if get_md5(file) != "275a2ca1d7a957be456b1fbd45895aca":
     :fetch {fetch = $fetcha} $file
   file = syntax/sshconfig.vim
-  @if get_md5(file) != "5f1e6ceec278b13ff60fdefcbccf1935":
+  @if get_md5(file) != "fc223a4ac0513349da81c3a5b02dc75a":
     :fetch {fetch = $fetcha} $file
   file = syntax/hercules.vim
   @if get_md5(file) != "587d0db0654459b061df0506a613cdc8":
@@ -2674,7 +2677,7 @@ all fetch:
   @if get_md5(file) != "f1e821294f2e8f595775fb42903cf4a2":
     :fetch {fetch = $fetcha} $file
   file = syntax/xml.vim
-  @if get_md5(file) != "abc10ccaf9978eeaf269dbf3b2a1c453":
+  @if get_md5(file) != "0a808fafb043a77a0bfdf2e635f05794":
     :fetch {fetch = $fetcha} $file
   file = syntax/tasm.vim
   @if get_md5(file) != "c1b85bb3cf68acfd1bddf910718d6ed9":
@@ -2853,6 +2856,9 @@ all fetch:
   file = syntax/ctrlh.vim
   @if get_md5(file) != "e8f42c20c14c68031670c73b18fa4ddb":
     :fetch {fetch = $fetcha} $file
+  file = syntax/taskdata.vim
+  @if get_md5(file) != "8a81c8bec160b8a52310e188f6b4e527":
+    :fetch {fetch = $fetcha} $file
   file = syntax/radiance.vim
   @if get_md5(file) != "22748970139f2f252afa406ca88a40fb":
     :fetch {fetch = $fetcha} $file
@@ -2965,7 +2971,7 @@ all fetch:
   @if get_md5(file) != "28ec817128176dbe3c5d3b157499224c":
     :fetch {fetch = $fetcha} $file
   file = syntax/2html.vim
-  @if get_md5(file) != "608f0cf482a2e6fc75a51e8a8e65adaa":
+  @if get_md5(file) != "5a91a8a0ab48220e67dc86b50cc1a962":
     :fetch {fetch = $fetcha} $file
   file = syntax/ldif.vim
   @if get_md5(file) != "41110873f8ce3e191eae952532e71de2":
@@ -3115,7 +3121,7 @@ all fetch:
   @if get_md5(file) != "2e2964b5d2205182ac76f52811416c5b":
     :fetch {fetch = $fetcha} $file
   file = syntax/sshdconfig.vim
-  @if get_md5(file) != "e2166ca460b58e55120ed37608da620c":
+  @if get_md5(file) != "70b23d54d3ddcd511f8d6300e5252b12":
     :fetch {fetch = $fetcha} $file
   file = syntax/resolv.vim
   @if get_md5(file) != "a6ef85dd1c051a79c37a099c161d17cc":
@@ -3860,6 +3866,9 @@ all fetch:
   file = keymap/magyar_utf-8.vim
   @if get_md5(file) != "6d46b55ebbed5909ebf9173342d47ba1":
     :fetch {fetch = $fetcha} $file
+  file = keymap/dvorak.vim
+  @if get_md5(file) != "d8c057e00b41f3f0a14e06427da10d6c":
+    :fetch {fetch = $fetcha} $file
   file = keymap/hebrewp_iso-8859-8.vim
   @if get_md5(file) != "e6a84c86acebf6bda90efd85690c1090":
     :fetch {fetch = $fetcha} $file
@@ -4600,7 +4609,7 @@ all fetch:
   @if get_md5(file) != "af0da03b5c998a8f8ed94a66763febd9":
     :fetch {fetch = $fetcha} $file
   file = doc/tags
-  @if get_md5(file) != "8ad46502e4e2005fb8c176d7e008b4c9":
+  @if get_md5(file) != "82ba992f710a51c992a24928810e00b5":
     :fetch {fetch = $fetcha} $file
   :mkdir {f} print
   file = print/jis_roman.ps
diff --git a/runtime/keymap/dvorak.vim b/runtime/keymap/dvorak.vim
new file mode 100644
index 00000000..77dc530b
--- /dev/null
+++ b/runtime/keymap/dvorak.vim
@@ -0,0 +1,82 @@
+" Maintainer:   Ashish SHUKLA <wahjava@members.fsf.org>
+" Last Changed: 2009 Jul 04
+"
+" All characters are ASCII, conversion to another encoding (e.g., UTF-8)
+" should work.
+
+let b:keymap_name = "en-dv"
+
+loadkeymap
+q	'
+w	,
+e	.
+r	p
+t	y
+y	f
+u	g
+i	c
+o	r
+p	l
+[	/
+]	=
+\\	\\
+a	a
+s	o
+d	e
+f	u
+g	i
+h	d
+j	h
+k	t
+l	n
+;	s
+'	-
+z	;
+x	q
+c	j
+v	k
+b	x
+n	b
+m	m
+,	w
+.	v
+/	z
+Z	:
+X	Q
+C	J
+V	K
+B	X
+N	B
+M	M
+<	W
+>	V
+?	Z
+A	A
+S	O
+D	E
+F	U
+G	I
+H	D
+J	H
+K	T
+L	N
+:	S
+\"	_
+Q	"
+W	<
+E	>
+R	P
+T	Y
+Y	F
+U	G
+I	C
+O	R
+P	L
+{	?
+}	+
+|	|
+-	[
+_	{
+=	]
++	}
+
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 62696e81..252a841f 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,13 +1,18 @@
 " Vim syntax support file
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2009 Jan 28
+" Last Change: 2009 Jul 14
 "	       (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
 "	       (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
 "	       (made w3 compliant by Edd Barrett <vext01@gmail.com>)
 "	       (added html_font. Edd Barrett <vext01@gmail.com>)
+"	       (dynamic folding by Ben Fritz <fritzophrenic@gmail.com>)
 
 " Transform a file into HTML, using the current syntax highlighting.
 
+" this file uses line continuations
+let s:cpo_sav = &cpo
+set cpo-=C
+
 " Number lines when explicitely requested or when `number' is set
 if exists("html_number_lines")
   let s:numblines = html_number_lines
@@ -22,6 +27,37 @@ else
   let s:htmlfont = "monospace"
 endif
 
+" make copies of the user-defined settings that we may overrule
+if exists("html_dynamic_folds")
+  let s:html_dynamic_folds = 1
+endif
+if exists("html_hover_unfold")
+  let s:html_hover_unfold = 1
+endif
+if exists("html_use_css")
+  let s:html_use_css = 1
+endif
+
+" hover opening implies dynamic folding
+if exists("s:html_hover_unfold")
+  let s:html_dynamic_folds = 1
+endif
+
+" dynamic folding with no foldcolumn implies hover opens
+if exists("s:html_dynamic_folds") && exists("html_no_foldcolumn")
+  let s:html_hover_unfold = 1
+endif
+
+" ignore folding overrides dynamic folding
+if exists("html_ignore_folding") && exists("s:html_dynamic_folds")
+  unlet s:html_dynamic_folds
+endif
+
+" dynamic folding implies css
+if exists("s:html_dynamic_folds")
+  let s:html_use_css = 1
+endif
+
 " When not in gui we can only guess the colors.
 if has("gui_running")
   let s:whatterm = "gui"
@@ -62,7 +98,7 @@ else
   endfun
 endif
 
-if !exists("html_use_css")
+if !exists("s:html_use_css")
   " Return opening HTML tag for given highlight id
   function! s:HtmlOpening(id)
     let a = ""
@@ -150,6 +186,26 @@ function! s:CSS1(id)
   return a
 endfun
 
+if exists("s:html_dynamic_folds")
+
+  " compares two folds as stored in our list of folds
+  " A fold is "less" than another if it starts at an earlier line number,
+  " or ends at a later line number, ties broken by fold level
+  function! s:FoldCompare(f1, f2)
+    if a:f1.firstline != a:f2.firstline
+      " put it before if it starts earlier
+      return a:f1.firstline - a:f2.firstline
+    elseif a:f1.lastline != a:f2.lastline
+      " put it before if it ends later
+      return a:f2.lastline - a:f1.lastline
+    else
+      " if folds begin and end on the same lines, put lowest fold level first
+      return a:f1.level - a:f2.level
+    endif
+  endfunction
+
+endif
+
 " Figure out proper MIME charset from the 'encoding' option.
 if exists("html_use_encoding")
   let s:html_encoding = html_use_encoding
@@ -228,7 +284,7 @@ if exists("html_no_pre")
   let s:old_html_no_pre = html_no_pre
 endif
 
-if !exists("html_use_css")
+if !exists("s:html_use_css")
   " Can't put font tags in <pre>
   let html_no_pre=1
 endif
@@ -251,9 +307,86 @@ if s:html_encoding != ""
   exe "normal! a<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:html_encoding . '"' . s:tag_close . "\n\e"
 endif
 
-if exists("html_use_css")
-  exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
+if exists("s:html_use_css")
+  if exists("s:html_dynamic_folds")
+    if exists("s:html_hover_unfold")
+      " if we are doing hover_unfold, use css 2 with css 1 fallback for IE6
+      exe "normal! a".
+	  \ "<style type=\"text/css\">\n<!--\n".
+	  \ ".FoldColumn { text-decoration: none; white-space: pre; }\n\n".
+	  \ "body * { margin: 0; padding: 0; }\n".
+	  \ "\n".
+	  \ ".open-fold   > .Folded { display: none;  }\n".
+	  \ ".open-fold   > .fulltext { display: inline; }\n".
+	  \ ".closed-fold > .fulltext { display: none;  }\n".
+	  \ ".closed-fold > .Folded { display: inline; }\n".
+	  \ "\n".
+	  \ ".open-fold   > .toggle-open   { display: none;   }\n".
+	  \ ".open-fold   > .toggle-closed { display: inline; }\n".
+	  \ ".closed-fold > .toggle-open   { display: inline; }\n".
+	  \ ".closed-fold > .toggle-closed { display: none;   }\n"
+      exe "normal! a\n/* opening a fold while hovering won't be supported by IE6 and other\n".
+	  \ "similar browsers, but it should fail gracefully. */\n".
+	  \ ".closed-fold:hover > .fulltext { display: inline; }\n".
+	  \ ".closed-fold:hover > .toggle-filler { display: none; }\n".
+	  \ ".closed-fold:hover > .Folded { display: none; }\n"
+      exe "normal! a-->\n</style>\n"
+      exe "normal! a<!--[if lt IE 7]>".
+	  \ "<style type=\"text/css\">\n".
+	  \ ".open-fold   .Folded      { display: none; }\n".
+	  \ ".open-fold   .fulltext      { display: inline; }\n".
+	  \ ".open-fold   .toggle-open   { display: none; }\n".
+	  \ ".closed-fold .toggle-closed { display: inline; }\n".
+	  \ "\n".
+	  \ ".closed-fold .fulltext      { display: none; }\n".
+	  \ ".closed-fold .Folded      { display: inline; }\n".
+	  \ ".closed-fold .toggle-open   { display: inline; }\n".
+	  \ ".closed-fold .toggle-closed { display: none; }\n".
+	  \ "</style>\n".
+	  \ "<![endif]-->\n"
+    else
+      " if we aren't doing hover_unfold, use CSS 1 only
+      exe "normal! a<style type=\"text/css\">\n<!--\n".
+	    \ ".FoldColumn { text-decoration: none; white-space: pre; }\n\n".
+	    \ ".open-fold   .Folded      { display: none; }\n".
+	    \ ".open-fold   .fulltext      { display: inline; }\n".
+	    \ ".open-fold   .toggle-open   { display: none; }\n".
+	    \ ".closed-fold .toggle-closed { display: inline; }\n".
+	    \ "\n".
+	    \ ".closed-fold .fulltext      { display: none; }\n".
+	    \ ".closed-fold .Folded      { display: inline; }\n".
+	    \ ".closed-fold .toggle-open   { display: inline; }\n".
+	    \ ".closed-fold .toggle-closed { display: none; }\n".
+	    \ "-->\n</style>\n"
+    endif
+  else
+    " if we aren't doing any dynamic folding, no need for any special rules
+    exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
+  endif
+endif
+
+" insert javascript to toggle folds open and closed
+if exists("s:html_dynamic_folds")
+  exe "normal! a\n".
+	\ "<script type='text/javascript'>\n".
+	\ "<!--\n".
+	\ "function toggleFold(objID)\n".
+	\ "{\n".
+	\ "  var fold;\n".
+	\ "  fold = document.getElementById(objID);\n".
+	\ "  if(fold.className == 'closed-fold')\n".
+	\ "  {\n".
+	\ "    fold.className = 'open-fold';\n".
+	\ "  }\n".
+	\ "  else if (fold.className == 'open-fold')\n".
+	\ "  {\n".
+	\ "    fold.className = 'closed-fold';\n".
+	\ "  }\n".
+	\ "}\n".
+	\ "-->\n".
+	\ "</script>\n\e"
 endif
+
 if exists("html_no_pre")
   exe "normal! a</head>\n<body>\n\e"
 else
@@ -265,7 +398,81 @@ exe s:orgwin . "wincmd w"
 " List of all id's
 let s:idlist = ","
 
-" Loop over all lines in the original text.
+" First do some preprocessing for dynamic folding. Do this for the entire file
+" so we don't accidentally start within a closed fold or something.
+let s:allfolds = []
+
+if exists("s:html_dynamic_folds")
+  let s:lnum = 1
+  let s:end = line('$')
+  " save the fold text and set it to the default so we can find fold levels
+  let s:foldtext_save = &foldtext
+  set foldtext&
+
+  " we will set the foldcolumn in the html to the greater of the maximum fold
+  " level and the current foldcolumn setting
+  let s:foldcolumn = &foldcolumn
+
+  " get all info needed to describe currently closed folds
+  while s:lnum < s:end
+    if foldclosed(s:lnum) == s:lnum
+      " default fold text has '+-' and then a number of dashes equal to fold
+      " level, so subtract 2 from index of first non-dash after the dashes
+      " in order to get the fold level of the current fold
+      let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
+      if s:level+1 > s:foldcolumn
+	let s:foldcolumn = s:level+1
+      endif
+      " store fold info for later use
+      let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
+      call add(s:allfolds, s:newfold)
+      " open the fold so we can find any contained folds
+      execute s:lnum."foldopen"
+    else
+      let s:lnum = s:lnum + 1
+    endif
+  endwhile
+
+  " close all folds to get info for originally open folds
+  silent! %foldclose!
+  let s:lnum = 1
+
+  " the originally open folds will be all folds we encounter that aren't
+  " already in the list of closed folds
+  while s:lnum < s:end
+    if foldclosed(s:lnum) == s:lnum
+      " default fold text has '+-' and then a number of dashes equal to fold
+      " level, so subtract 2 from index of first non-dash after the dashes
+      " in order to get the fold level of the current fold
+      let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2
+      if s:level+1 > s:foldcolumn
+	let s:foldcolumn = s:level+1
+      endif
+      let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
+      " only add the fold if we don't already have it
+      if empty(s:allfolds) || index(s:allfolds, s:newfold) == -1
+	let s:newfold.type = "open-fold"
+	call add(s:allfolds, s:newfold)
+      endif
+      " open the fold so we can find any contained folds
+      execute s:lnum."foldopen"
+    else
+      let s:lnum = s:lnum + 1
+    endif
+  endwhile
+
+  " sort the folds so that we only ever need to look at the first item in the
+  " list of folds
+  call sort(s:allfolds, "s:FoldCompare")
+
+  let &foldtext = s:foldtext_save
+  unlet s:foldtext_save
+
+  " close all folds again so we can get the fold text as we go
+  silent! %foldclose! 
+endif
+
+" Now loop over all lines in the original text to convert to html.
 " Use html_start_line and html_end_line if they are set.
 if exists("html_start_line")
   let s:lnum = html_start_line
@@ -283,6 +490,10 @@ if exists("html_end_line")
 else
   let s:end = line("$")
 endif
+
+" stack to keep track of all the folds containing the current line
+let s:foldstack = []
+
 if s:numblines
   let s:margin = strlen(s:end) + 1
 else
@@ -300,6 +511,7 @@ if s:difffillchar == ''
   let s:difffillchar = '-'
 endif
 
+let s:foldId = 0
 
 while s:lnum <= s:end
 
@@ -339,16 +551,18 @@ while s:lnum <= s:end
 
   " Start the line with the line number.
   if s:numblines
-    let s:new = repeat(' ', s:margin - 1 - strlen(s:lnum)) . s:lnum . ' '
+    let s:numcol = repeat(' ', s:margin - 1 - strlen(s:lnum)) . s:lnum . ' '
   else
-    let s:new = ""
+    let s:numcol = ""
   endif
 
-  if has('folding') && !exists('html_ignore_folding') && foldclosed(s:lnum) > -1
+  let s:new = ""
+
+  if has('folding') && !exists('html_ignore_folding') && foldclosed(s:lnum) > -1 && !exists('s:html_dynamic_folds')
     "
-    " This is the beginning of a folded block
+    " This is the beginning of a folded block (with no dynamic folding)
     "
-    let s:new = s:new . foldtextresult(s:lnum)
+    let s:new = s:numcol . foldtextresult(s:lnum)
     if !exists("html_no_pre")
       " HTML line wrapping is off--go ahead and fill to the margin
       let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new))
@@ -361,13 +575,96 @@ while s:lnum <= s:end
 
   else
     "
-    " A line that is not folded.
+    " A line that is not folded, or doing dynamic folding.
     "
     let s:line = getline(s:lnum)
     let s:len = strlen(s:line)
 
+    if exists("s:html_dynamic_folds")
+      " First insert a closing for any open folds that end on this line
+      while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
+	let s:new = s:new."</span></span>"
+	call remove(s:foldstack, 0)
+      endwhile
+
+      " Now insert an opening any new folds that start on this line
+      let s:firstfold = 1
+      while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
+	let s:foldId = s:foldId + 1
+	let s:new = s:new . "<span id='fold".s:foldId."' class='".s:allfolds[0].type."'>"
+
+	" Unless disabled, add a fold column for the opening line of a fold.
+	"
+	" Note that dynamic folds require using css so we just use css to take
+	" care of the leading spaces rather than using &nbsp; in the case of
+	" html_no_pre to make it easier
+	if !exists("html_no_foldcolumn")
+	  " add fold column that can open the new fold
+	  if s:allfolds[0].level > 1 && s:firstfold
+	    let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>"
+	    let s:new = s:new . repeat('|', s:allfolds[0].level - 1) . "</a>"
+	  endif
+	  let s:new = s:new . "<a class='toggle-open FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>+</a>"
+	  let s:new = s:new . "<a class='toggle-open "
+	  " If this is not the last fold we're opening on this line, we need
+	  " to keep the filler spaces hidden if the fold is opened by mouse
+	  " hover. If it is the last fold to open in the line, we shouldn't hide
+	  " them, so don't apply the toggle-filler class.
+	  if get(s:allfolds, 1, {'firstline': 0}).firstline == s:lnum
+	    let s:new = s:new . "toggle-filler "
+	  endif
+	  let s:new = s:new . "FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>"
+	  let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level) . "</a>"
+
+	  " add fold column that can close the new fold
+	  let s:new = s:new . "<a class='toggle-closed FoldColumn' href='javascript:toggleFold(\"fold".s:foldId."\")'>"
+	  if s:firstfold
+	    let s:new = s:new . repeat('|', s:allfolds[0].level - 1)
+	  endif
+	  let s:new = s:new . "-"
+	  " only add spaces if we aren't opening another fold on the same line
+	  if get(s:allfolds, 1, {'firstline': 0}).firstline != s:lnum
+	    let s:new = s:new . repeat(" ", s:foldcolumn - s:allfolds[0].level)
+	  endif
+	  let s:new = s:new . "</a>"
+	  let s:firstfold = 0
+	endif
+
+	" add fold text, moving the span ending to the next line so collapsing
+	" of folds works correctly
+	let s:new = s:new . substitute(s:HtmlFormat(s:numcol . foldtextresult(s:lnum), "Folded"), '</span>', s:HtmlEndline.'\r\0', '')
+	let s:new = s:new . "<span class='fulltext'>"
+
+	" open the fold now that we have the fold text to allow retrieval of
+	" fold text for subsequent folds
+	execute s:lnum."foldopen"
+	call insert(s:foldstack, remove(s:allfolds,0))
+	let s:foldstack[0].id = s:foldId
+      endwhile
+
+      " Unless disabled, add a fold column for other lines.
+      "
+      " Note that dynamic folds require using css so we just use css to take
+      " care of the leading spaces rather than using &nbsp; in the case of
+      " html_no_pre to make it easier
+      if !exists("html_no_foldcolumn")
+	if empty(s:foldstack)
+	  " add the empty foldcolumn for unfolded lines
+	  let s:new = s:new . s:HtmlFormat(repeat(' ', s:foldcolumn), "FoldColumn")
+	else
+	  " add the fold column for folds not on the opening line
+	  if get(s:foldstack, 0).firstline < s:lnum
+	    let s:new = s:new . "<a class='FoldColumn' href='javascript:toggleFold(\"fold".s:foldstack[0].id."\")'>"
+	    let s:new = s:new . repeat('|', s:foldstack[0].level)
+	    let s:new = s:new . repeat(' ', s:foldcolumn - s:foldstack[0].level) . "</a>"
+	  endif
+	endif
+      endif
+    endif
+
+    " Now continue with the unfolded line text
     if s:numblines
-      let s:new = s:HtmlFormat(s:new, "lnr")
+      let s:new = s:new . s:HtmlFormat(s:numcol, "lnr")
     endif
 
     " Get the diff attribute, if any.
@@ -436,8 +733,22 @@ endwhile
 " Finish with the last line
 exe s:newwin . "wincmd w"
 
+if exists("s:html_dynamic_folds")
+  " finish off any open folds
+  while !empty(s:foldstack)
+    exe "normal! a</span></span>"
+    call remove(s:foldstack, 0)
+  endwhile
+
+  " add fold column to the style list if not already there
+  let s:id = hlID('FoldColumn')
+  if stridx(s:idlist, "," . s:id . ",") == -1
+    let s:idlist = s:idlist . s:id . ","
+  endif
+endif
+
 " Close off the font tag that encapsulates the whole <body>
-if !exists("html_use_css")
+if !exists("s:html_use_css")
   exe "normal! a</font>\e"
 endif
 
@@ -449,7 +760,7 @@ endif
 
 
 " Now, when we finally know which, we define the colors and styles
-if exists("html_use_css")
+if exists("s:html_use_css")
   1;/<style type="text/+1
 endif
 
@@ -466,7 +777,7 @@ endif
 " Normal/global attributes
 " For Netscape 4, set <body> attributes too, though, strictly speaking, it's
 " incorrect.
-if exists("html_use_css")
+if exists("s:html_use_css")
   if exists("html_no_pre")
     execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e"
   else
@@ -476,12 +787,12 @@ if exists("html_use_css")
     execute "normal! ^cwbody\e"
   endif
 else
-    execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">'
+  execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">'
 endif
 
 " Line numbering attributes
 if s:numblines
-  if exists("html_use_css")
+  if exists("s:html_use_css")
     execute "normal! A\n.lnr { " . s:CSS1(hlID("LineNr")) . "}\e"
   else
     execute '%s+^<span class="lnr">\([^<]*\)</span>+' . s:HtmlOpening(hlID("LineNr")) . '\1' . s:HtmlClosing(hlID("LineNr")) . '+g'
@@ -500,14 +811,14 @@ while s:idlist != ""
   " If the class has some attributes, export the style, otherwise DELETE all
   " its occurences to make the HTML shorter
   if s:attr != ""
-    if exists("html_use_css")
+    if exists("s:html_use_css")
       execute "normal! A\n." . s:id_name . " { " . s:attr . "}"
     else
       execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g'
     endif
   else
     execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+ge'
-    if exists("html_use_css")
+    if exists("s:html_use_css")
       1;/<style type="text/+1
     endif
   endif
@@ -559,9 +870,21 @@ if !v:profiling
   delfunc s:HtmlColor
   delfunc s:HtmlFormat
   delfunc s:CSS1
-  if !exists("html_use_css")
+  if !exists("s:html_use_css")
     delfunc s:HtmlOpening
     delfunc s:HtmlClosing
   endif
 endif
-silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline
+silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline s:firstfold s:foldcolumn
+unlet s:foldstack s:allfolds s:foldId s:numcol
+
+if exists("s:html_dynamic_folds")
+  delfunc s:FoldCompare
+endif
+
+silent! unlet s:html_dynamic_folds s:html_hover_unfold s:html_use_css
+
+let &cpo = s:cpo_sav
+unlet s:cpo_sav
+
+" vim: noet sw=2 sts=2
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index f2a1f8b9..45947f20 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -1,21 +1,21 @@
 " Vim syntax file
 " Language: OpenSSH client configuration file (ssh_config)
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2009-01-08
+" Last Change: 2009-07-09
 
 " Setup
 if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
+  if exists("b:current_syntax")
+    finish
+  endif
 else
-	syntax clear
+  syntax clear
 endif
 
 if version >= 600
-	setlocal iskeyword=_,-,a-z,A-Z,48-57
+  setlocal iskeyword=_,-,a-z,A-Z,48-57
 else
-	set iskeyword=_,-,a-z,A-Z,48-57
+  set iskeyword=_,-,a-z,A-Z,48-57
 endif
 
 syn case ignore
@@ -27,7 +27,6 @@ syn keyword sshconfigTodo TODO FIXME NOT contained
 " Constants
 syn keyword sshconfigYesNo yes no ask
 syn keyword sshconfigYesNo any auto
-syn keyword sshconfigCipher blowfish des 3des
 syn keyword sshconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
 syn keyword sshconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr
 syn keyword sshconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
@@ -39,8 +38,8 @@ syn keyword sshconfigPreferredAuth hostbased publickey password
 syn keyword sshconfigPreferredAuth keyboard-interactive
 syn keyword sshconfigLogLevel QUIET FATAL ERROR INFO VERBOSE
 syn keyword sshconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3
-syn keyword sshconfigSysLogFacility DAEMON USER AUTH LOCAL0 LOCAL1 LOCAL2
-syn keyword sshconfigSysLogFacility LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
+syn keyword sshconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
+syn keyword sshconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
 syn match sshconfigVar "%[rhpldun]\>"
 syn match sshconfigSpecial "[*?]"
 syn match sshconfigNumber "\d\+"
@@ -63,20 +62,20 @@ syn keyword sshconfigKeyword ForwardX11Trusted
 syn keyword sshconfigKeyword GSSAPIAuthentication
 syn keyword sshconfigKeyword GSSAPIDelegateCredentials GatewayPorts
 syn keyword sshconfigKeyword GlobalKnownHostsFile
-syn keyword sshconfigKeyword HostKeyAlgorithms KbdInteractiveAuthentication
-syn keyword sshconfigKeyword HashKnownHosts KbdInteractiveDevices
+syn keyword sshconfigKeyword HostKeyAlgorithms HashKnownHosts
 syn keyword sshconfigKeyword HostKeyAlias HostName HostbasedAuthentication
 syn keyword sshconfigKeyword IdentitiesOnly IdentityFile
-syn keyword sshconfigKeyword LocalForward LogLevel
+syn keyword sshconfigKeyword KbdInteractiveAuthentication KbdInteractiveDevices
+syn keyword sshconfigKeyword LocalCommand LocalForward LogLevel
 syn keyword sshconfigKeyword MACs
 syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
 syn keyword sshconfigKeyword NumberOfPasswordPrompts
-syn keyword sshconfigKeyword PasswordAuthentication
+syn keyword sshconfigKeyword PasswordAuthentication PermitLocalCommand
 syn keyword sshconfigKeyword Port PreferredAuthentications Protocol
 syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication
 syn keyword sshconfigKeyword PermitLocalCommand
 syn keyword sshconfigKeyword RSAAuthentication RemoteForward RekeyLimit
-syn keyword sshconfigKeyword RhostsAuthentication RhostsRSAAuthentication
+syn keyword sshconfigKeyword RhostsRSAAuthentication
 syn keyword sshconfigKeyword SendEnv ServerAliveCountMax ServerAliveInterval
 syn keyword sshconfigKeyword SmartcardDevice StrictHostKeyChecking
 syn keyword sshconfigKeyword Tunnel TunnelDevice
@@ -87,32 +86,31 @@ syn keyword sshconfigKeyword XAuthLocation
 
 " Define the default highlighting
 if version >= 508 || !exists("did_sshconfig_syntax_inits")
-	if version < 508
-		let did_sshconfig_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+  if version < 508
+    let did_sshconfig_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
 
-	HiLink sshconfigComment Comment
-	HiLink sshconfigTodo Todo
-	HiLink sshconfigHostPort sshconfigConstant
-	HiLink sshconfigNumber sshconfigConstant
-	HiLink sshconfigConstant Constant
-	HiLink sshconfigYesNo sshconfigEnum
-	HiLink sshconfigCipher sshconfigEnum
-	HiLink sshconfigMAC sshconfigEnum
-	HiLink sshconfigHostKeyAlg sshconfigEnum
-	HiLink sshconfigLogLevel sshconfigEnum
-	HiLink sshconfigSysLogFacility sshconfigEnum
-	HiLink sshconfigPreferredAuth sshconfigEnum
-	HiLink sshconfigVar sshconfigEnum
-	HiLink sshconfigEnum Identifier
-	HiLink sshconfigSpecial Special
-	HiLink sshconfigKeyword Keyword
-	HiLink sshconfigHostSect Type
-	delcommand HiLink
+  HiLink sshconfigComment        Comment
+  HiLink sshconfigTodo           Todo
+  HiLink sshconfigHostPort       sshconfigConstant
+  HiLink sshconfigNumber         sshconfigConstant
+  HiLink sshconfigConstant       Constant
+  HiLink sshconfigYesNo          sshconfigEnum
+  HiLink sshconfigCipher         sshconfigEnum
+  HiLink sshconfigMAC            sshconfigEnum
+  HiLink sshconfigHostKeyAlg     sshconfigEnum
+  HiLink sshconfigLogLevel       sshconfigEnum
+  HiLink sshconfigSysLogFacility sshconfigEnum
+  HiLink sshconfigPreferredAuth  sshconfigEnum
+  HiLink sshconfigVar            sshconfigEnum
+  HiLink sshconfigEnum           Identifier
+  HiLink sshconfigSpecial        Special
+  HiLink sshconfigKeyword        Keyword
+  HiLink sshconfigHostSect       Type
+  delcommand HiLink
 endif
 
 let b:current_syntax = "sshconfig"
-
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index 2217e096..97ee8f87 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -1,23 +1,21 @@
 " Vim syntax file
-" This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: OpenSSH server configuration file (sshd_config)
-" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2006-03-05
-" URL: http://trific.ath.cx/Ftp/vim/syntax/sshdconfig.vim
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2009-07-09
 
 " Setup
 if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
+  if exists("b:current_syntax")
+    finish
+  endif
 else
-	syntax clear
+  syntax clear
 endif
 
 if version >= 600
-	setlocal iskeyword=_,-,a-z,A-Z,48-57
+  setlocal iskeyword=_,-,a-z,A-Z,48-57
 else
-	set iskeyword=_,-,a-z,A-Z,48-57
+  set iskeyword=_,-,a-z,A-Z,48-57
 endif
 
 syn case ignore
@@ -27,78 +25,87 @@ syn match sshdconfigComment "#.*$" contains=sshdconfigTodo
 syn keyword sshdconfigTodo TODO FIXME NOT contained
 
 " Constants
-syn keyword sshdconfigYesNo yes no
+syn keyword sshdconfigYesNo yes no none
+syn keyword sshdconfigAddressFamily any inet inet6
 syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
 syn keyword sshdconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr
 syn keyword sshdconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
 syn keyword sshdconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
 syn keyword sshdconfigMAC hmac-md5-96
+syn match sshdconfigMAC "\<umac-64@openssh\.com\>"
 syn keyword sshdconfigRootLogin without-password forced-commands-only
 syn keyword sshdconfigLogLevel QUIET FATAL ERROR INFO VERBOSE
 syn keyword sshdconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3
-syn keyword sshdconfigSysLogFacility DAEMON USER AUTH LOCAL0 LOCAL1 LOCAL2
-syn keyword sshdconfigSysLogFacility LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
+syn keyword sshdconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
+syn keyword sshdconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
 syn match sshdconfigSpecial "[*?]"
 syn match sshdconfigNumber "\d\+"
 syn match sshdconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
 syn match sshdconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
+" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
 syn match sshdconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}:\d\+\>"
 syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>"
 
 " Keywords
-syn keyword sshdconfigKeyword AcceptEnv AddressFamily
+syn keyword sshdconfigMatch Host User Group Address
+syn keyword sshdconfigKeyword AcceptEnv AddressFamily AllowAgentForwarding
 syn keyword sshdconfigKeyword AllowGroups AllowTcpForwarding
-syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile Banner
-syn keyword sshdconfigKeyword ChallengeResponseAuthentication
+syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile
+syn keyword sshdconfigKeyword Banner
+syn keyword sshdconfigKeyword ChallengeResponseAuthentication ChrootDirectory
 syn keyword sshdconfigKeyword Ciphers ClientAliveCountMax
 syn keyword sshdconfigKeyword ClientAliveInterval Compression
-syn keyword sshdconfigKeyword DenyGroups DenyUsers GSSAPIAuthentication
-syn keyword sshdconfigKeyword GSSAPICleanupCredentials GatewayPorts
-syn keyword sshdconfigKeyword HostKey HostbasedAuthentication
+syn keyword sshdconfigKeyword DenyGroups DenyUsers
+syn keyword sshdconfigKeyword ForceCommand
+syn keyword sshdconfigKeyword GatewayPorts GSSAPIAuthentication
+syn keyword sshdconfigKeyword GSSAPICleanupCredentials
+syn keyword sshdconfigKeyword HostbasedAuthentication HostKey
 syn keyword sshdconfigKeyword IgnoreRhosts IgnoreUserKnownHosts
-syn keyword sshdconfigKeyword KerberosAuthentication KerberosOrLocalPasswd
-syn keyword sshdconfigKeyword KerberosTgtPassing KerberosTicketCleanup
-syn keyword sshdconfigKeyword KerberosGetAFSToken
-syn keyword sshdconfigKeyword KeyRegenerationInterval ListenAddress
-syn keyword sshdconfigKeyword LogLevel LoginGraceTime MACs MaxAuthTries
-syn keyword sshdconfigKeyword MaxStartups PasswordAuthentication
-syn keyword sshdconfigKeyword PermitEmptyPasswords PermitRootLogin
+syn keyword sshdconfigKeyword KerberosAuthentication KerberosGetAFSToken
+syn keyword sshdconfigKeyword KerberosOrLocalPasswd KerberosTicketCleanup
+syn keyword sshdconfigKeyword KeyRegenerationInterval
+syn keyword sshdconfigKeyword ListenAddress LoginGraceTime LogLevel
+syn keyword sshdconfigKeyword MACs Match MaxAuthTries MaxSessions MaxStartups
+syn keyword sshdconfigKeyword PasswordAuthentication PermitEmptyPasswords
+syn keyword sshdconfigKeyword PermitRootLogin PermitOpen PermitTunnel
 syn keyword sshdconfigKeyword PermitUserEnvironment PidFile Port
 syn keyword sshdconfigKeyword PrintLastLog PrintMotd Protocol
-syn keyword sshdconfigKeyword PubkeyAuthentication RSAAuthentication
-syn keyword sshdconfigKeyword RhostsAuthentication RhostsRSAAuthentication
-syn keyword sshdconfigKeyword ServerKeyBits StrictModes Subsystem
-syn keyword sshdconfigKeyword ShowPatchLevel
-syn keyword sshdconfigKeyword SyslogFacility TCPKeepAlive UseDNS
-syn keyword sshdconfigKeyword UseLogin UsePAM UsePrivilegeSeparation
+syn keyword sshdconfigKeyword PubkeyAuthentication
+syn keyword sshdconfigKeyword RhostsRSAAuthentication RSAAuthentication
+syn keyword sshdconfigKeyword ServerKeyBits ShowPatchLevel StrictModes
+syn keyword sshdconfigKeyword Subsystem SyslogFacility
+syn keyword sshdconfigKeyword TCPKeepAlive
+syn keyword sshdconfigKeyword UseDNS UseLogin UsePAM UsePrivilegeSeparation
 syn keyword sshdconfigKeyword X11DisplayOffset X11Forwarding
 syn keyword sshdconfigKeyword X11UseLocalhost XAuthLocation
 
 " Define the default highlighting
 if version >= 508 || !exists("did_sshdconfig_syntax_inits")
-	if version < 508
-		let did_sshdconfig_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+  if version < 508
+    let did_sshdconfig_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
 
-	HiLink sshdconfigComment Comment
-	HiLink sshdconfigTodo Todo
-	HiLink sshdconfigHostPort sshdconfigConstant
-	HiLink sshdconfigTime sshdconfigConstant
-	HiLink sshdconfigNumber sshdconfigConstant
-	HiLink sshdconfigConstant Constant
-	HiLink sshdconfigYesNo sshdconfigEnum
-	HiLink sshdconfigCipher sshdconfigEnum
-	HiLink sshdconfigMAC sshdconfigEnum
-	HiLink sshdconfigRootLogin sshdconfigEnum
-	HiLink sshdconfigLogLevel sshdconfigEnum
-	HiLink sshdconfigSysLogFacility sshdconfigEnum
-	HiLink sshdconfigEnum Function
-	HiLink sshdconfigSpecial Special
-	HiLink sshdconfigKeyword Keyword
-	delcommand HiLink
+  HiLink sshdconfigComment        Comment
+  HiLink sshdconfigTodo           Todo
+  HiLink sshdconfigHostPort       sshdconfigConstant
+  HiLink sshdconfigTime           sshdconfigConstant
+  HiLink sshdconfigNumber         sshdconfigConstant
+  HiLink sshdconfigConstant       Constant
+  HiLink sshdconfigYesNo          sshdconfigEnum
+  HiLink sshdconfigAddressFamily  sshdconfigEnum
+  HiLink sshdconfigCipher         sshdconfigEnum
+  HiLink sshdconfigMAC            sshdconfigEnum
+  HiLink sshdconfigRootLogin      sshdconfigEnum
+  HiLink sshdconfigLogLevel       sshdconfigEnum
+  HiLink sshdconfigSysLogFacility sshdconfigEnum
+  HiLink sshdconfigEnum           Function
+  HiLink sshdconfigSpecial        Special
+  HiLink sshdconfigKeyword        Keyword
+  HiLink sshdconfigMatch          Type
+  delcommand HiLink
 endif
 
 let b:current_syntax = "sshdconfig"
diff --git a/runtime/syntax/taskdata.vim b/runtime/syntax/taskdata.vim
new file mode 100644
index 00000000..79186e0a
--- /dev/null
+++ b/runtime/syntax/taskdata.vim
@@ -0,0 +1,43 @@
+" Vim syntax file
+" Language:	task data
+" Maintainer:	John Florian <jflorian@doubledog.org>
+" Updated:	Wed Jul  8 19:46:20 EDT 2009
+
+
+" For version 5.x: Clear all syntax items.
+" For version 6.x: Quit when a syntax file was already loaded.
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Key Names for values.
+syn keyword taskdataKey		description due end entry imask mask parent
+syn keyword taskdataKey		priority project recur start status tags uuid
+syn match taskdataKey		"annotation_\d\+"
+syn match taskdataUndo		"^time.*$"
+syn match taskdataUndo		"^\(old \|new \|---\)"
+
+" Values associated with key names.
+"
+" Strings
+syn region taskdataString	matchgroup=Normal start=+"+ end=+"+
+			\	contains=taskdataEncoded,taskdataUUID,@Spell
+"
+" Special Embedded Characters (e.g., "&comma;")
+syn match taskdataEncoded	"&\a\+;" contained
+" UUIDs
+syn match taskdataUUID		"\x\{8}-\(\x\{4}-\)\{3}\x\{12}" contained
+
+
+" The default methods for highlighting.  Can be overridden later.
+hi def link taskdataEncoded	Function
+hi def link taskdataKey		Statement
+hi def link taskdataString 	String
+hi def link taskdataUUID 	Special
+hi def link taskdataUndo 	Type
+
+let b:current_syntax = "taskdata"
+
+" vim:noexpandtab
diff --git a/runtime/syntax/taskedit.vim b/runtime/syntax/taskedit.vim
new file mode 100644
index 00000000..c7e0ea75
--- /dev/null
+++ b/runtime/syntax/taskedit.vim
@@ -0,0 +1,35 @@
+" Vim syntax file
+" Language:	support for 'task 42 edit'
+" Maintainer:	John Florian <jflorian@doubledog.org>
+" Updated:	Wed Jul  8 19:46:32 EDT 2009
+
+
+" For version 5.x: Clear all syntax items.
+" For version 6.x: Quit when a syntax file was already loaded.
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn match taskeditHeading	"^\s*#\s*Name\s\+Editable details\s*$" contained
+syn match taskeditHeading	"^\s*#\s*-\+\s\+-\+\s*$" contained
+syn match taskeditReadOnly	"^\s*#\s*\(UU\)\?ID:.*$" contained
+syn match taskeditReadOnly	"^\s*#\s*Status:.*$" contained
+syn match taskeditReadOnly	"^\s*#\s*i\?Mask:.*$" contained
+syn match taskeditKey		"^ *.\{-}:" nextgroup=taskeditString
+syn match taskeditComment	"^\s*#.*$"
+			\	contains=taskeditReadOnly,taskeditHeading
+syn match taskeditString	".*$" contained contains=@Spell
+
+
+" The default methods for highlighting.  Can be overridden later.
+hi def link taskeditComment	Comment
+hi def link taskeditHeading	Function
+hi def link taskeditKey		Statement
+hi def link taskeditReadOnly	Special
+hi def link taskeditString	String
+
+let b:current_syntax = "taskedit"
+
+" vim:noexpandtab
diff --git a/runtime/syntax/xml.vim b/runtime/syntax/xml.vim
index df3a84fe..58d6db03 100644
--- a/runtime/syntax/xml.vim
+++ b/runtime/syntax/xml.vim
@@ -3,7 +3,7 @@
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
 "		Author and previous maintainer:
 "		Paul Siegmann <pauls@euronet.nl>
-" Last Change:	Mi, 13 Apr 2005 22:40:09 CEST
+" Last Change:	2009-07-13 21:26:55
 " Filenames:	*.xml
 " $Id: xml.vim,v 1.3 2006/04/11 21:32:00 vimboss Exp $
 
@@ -216,7 +216,7 @@ if exists('g:xml_syntax_folding')
     syn region  xmlComment
 	\ start=+<!+
 	\ end=+>+
-	\ contains=xmlCommentPart,xmlCommentError
+	\ contains=xmlCommentStart,xmlCommentError
 	\ extend
 	\ fold
 
@@ -228,11 +228,12 @@ else
     syn region  xmlComment
 	\ start=+<!+
 	\ end=+>+
-	\ contains=xmlCommentPart,xmlCommentError
+	\ contains=xmlCommentStart,xmlCommentError
 	\ extend
 
 endif
 
+syn match xmlCommentStart   contained "<!" nextgroup=xmlCommentPart
 syn keyword xmlTodo         contained TODO FIXME XXX
 syn match   xmlCommentError contained "[^><!]"
 syn region  xmlCommentPart
@@ -320,6 +321,7 @@ hi def link xmlAttrib		Type
 
 hi def link xmlString		String
 hi def link xmlComment		Comment
+hi def link xmlCommentStart	xmlComment
 hi def link xmlCommentPart	Comment
 hi def link xmlCommentError	Error
 hi def link xmlError		Error
-- 
2.11.4.GIT