Updated runtime files.

24 files changed, 501 insertions, 133 deletions

diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim
index 5420321b6..b2f1aeeb9 100644
--- a/runtime/autoload/htmlcomplete.vim
+++ b/runtime/autoload/htmlcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Oct 19
+" Last Change:	2011 Apr 28
 
 function! htmlcomplete#CompleteTags(findstart, base)
   if a:findstart
@@ -285,6 +285,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 				let cssfiles = styletable + secimportfiles
 				let classes = []
 				for file in cssfiles
+				  	let classlines = []
 					if filereadable(file)
 						let stylesheet = readfile(file)
 						let stylefile = join(stylesheet, ' ')
diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim
index ce97ec9fa..ad33cee1d 100644
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 Jan 05
+" Last Change: 2011 Apr 05
 "
 " Additional contributors:
 "
@@ -16,7 +16,7 @@ set cpo-=C
 " Automatically find charsets from all encodings supported natively by Vim. With
 " the 8bit- and 2byte- prefixes, Vim can actually support more encodings than
 " this. Let the user specify these however since they won't be supported on
-" every system. TODO: how? g:html_charsets and g:html_encodings?
+" every system.
 "
 " Note, not all of Vim's supported encodings have a charset to use.
 "
@@ -312,8 +312,9 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
       " figure out whether current charset and encoding will work, if not
       " default to UTF-8
       if !exists('g:html_use_encoding') &&
-	    \ (&l:fileencoding!='' && &l:fileencoding!=s:settings.vim_encoding ||
-	    \  &l:fileencoding=='' &&       &encoding!=s:settings.vim_encoding)
+	    \ (((&l:fileencoding=='' || (&l:buftype!='' && &l:buftype!=?'help'))
+	    \      && &encoding!=?s:settings.vim_encoding)
+	    \ || &l:fileencoding!='' && &l:fileencoding!=?s:settings.vim_encoding)
 	echohl WarningMsg
 	echomsg "TOhtml: mismatched file encodings in Diff buffers, using UTF-8"
 	echohl None
@@ -603,6 +604,7 @@ func! tohtml#GetUserSettings() "{{{
     call tohtml#GetOption(user_settings,    'no_progress', !has("statusline") )
     call tohtml#GetOption(user_settings,  'diff_one_file', 0 )
     call tohtml#GetOption(user_settings,   'number_lines', &number )
+    call tohtml#GetOption(user_settings,       'pre_wrap', &wrap )
     call tohtml#GetOption(user_settings,        'use_css', 1 )
     call tohtml#GetOption(user_settings, 'ignore_conceal', 0 )
     call tohtml#GetOption(user_settings, 'ignore_folding', 0 )
@@ -641,7 +643,13 @@ func! tohtml#GetUserSettings() "{{{
     " aren't allowed inside a <pre> block
     if !user_settings.use_css
       let user_settings.no_pre = 1
-    endif "}}}
+    endif
+
+    " pre_wrap doesn't do anything if not using pre or not using CSS
+    if user_settings.no_pre || !user_settings.use_css
+      let user_settings.pre_wrap=0
+    endif
+    "}}}
 
     " set up expand_tabs option after all the overrides so we know the
     " appropriate defaults {{{
@@ -669,9 +677,16 @@ func! tohtml#GetUserSettings() "{{{
       endif
     else
       " Figure out proper MIME charset from 'fileencoding' if possible
-      if &l:fileencoding != ''
-	let user_settings.vim_encoding = &l:fileencoding
-	call tohtml#CharsetFromEncoding(user_settings)
+      if &l:fileencoding != '' 
+	" If the buffer is not a "normal" type, the 'fileencoding' value may not
+	" be trusted; since the buffer should not be written the fileencoding is
+	" not intended to be used.
+	if &l:buftype=='' || &l:buftype==?'help'
+	  let user_settings.vim_encoding = &l:fileencoding
+	  call tohtml#CharsetFromEncoding(user_settings)
+	else
+	  let user_settings.encoding = '' " trigger detection using &encoding
+	endif
       endif
 
       " else from 'encoding' if possible
diff --git a/runtime/compiler/cs.vim b/runtime/compiler/cs.vim
index 5b75d6d2a..7ba0b609f 100644
--- a/runtime/compiler/cs.vim
+++ b/runtime/compiler/cs.vim
@@ -1,7 +1,8 @@
 " Vim compiler file
-" Compiler:	ms C#
-" Maintainer:	Joseph H. Yao (hyao@sina.com)
-" Last Change:	2004 Mar 27
+" Compiler:	Microsoft Visual Studio C#
+" Maintainer:	Zhou YiChao (broken.zhou@gmail.com)
+" Previous Maintainer:	Joseph H. Yao (hyao@sina.com)
+" Last Change:	2011 Apr 21
 
 if exists("current_compiler")
   finish
@@ -12,8 +13,9 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-" default errorformat
 CompilerSet errorformat&
+CompilerSet errorformat+=%f(%l\\,%v):\ %t%*[^:]:\ %m,
+            \%trror%*[^:]:\ %m,
+            \%tarning%*[^:]:\ %m
 
-" default make
 CompilerSet makeprg=csc\ %
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index c129e3fc8..d40df2341 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.3.  Last change: 2010 Jul 22
+*autocmd.txt*   For Vim version 7.3.  Last change: 2011 Apr 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -786,7 +786,10 @@ TermChanged			After the value of 'term' has changed.  Useful
 TermResponse			After the response to |t_RV| is received from
 				the terminal.  The value of |v:termresponse|
 				can be used to do things depending on the
-				terminal version.
+				terminal version.  Note that this event may be
+				triggered halfway executing another event,
+				especially if file I/O, a shell command or
+				anything else that takes time is involved.
 							*User*
 User				Never executed automatically.  To be used for
 				autocommands that are only executed with
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 01767f905..288ddd78a 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.3.  Last change: 2010 Dec 08
+*diff.txt*      For Vim version 7.3.  Last change: 2011 Apr 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -167,8 +167,8 @@ in diff mode in one window and "normal" in another window.  It is also
 possible to view the changes you have made to a buffer since the file was
 loaded.  Since Vim doesn't allow having two buffers for the same file, you
 need another buffer.  This command is useful: >
-	 command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
-	 	\ | wincmd p | diffthis
+	 command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_
+	 	\ | diffthis | wincmd p | diffthis
 (this is in |vimrc_example.vim|).  Use ":DiffOrig" to see the differences
 between the current buffer and the file it was loaded from.
 
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 3e06aaacf..405c3dd8b 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.3.  Last change: 2011 Mar 18
+*indent.txt*    For Vim version 7.3.  Last change: 2011 Apr 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -472,6 +472,8 @@ assume a 'shiftwidth' of 4.
 
 	*N    Vim searches for unclosed comments at most N lines away.  This
 	      limits the time needed to search for the start of a comment.
+	      If your /* */ comments stop indenting afer N lines this is the
+	      value you will want to change.
 	      (default 70 lines).
 
 	#N    When N is non-zero recognize shell/Perl comments, starting with
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index c18eed104..29b9e9f35 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.3.  Last change: 2010 Nov 10
+*map.txt*       For Vim version 7.3.  Last change: 2011 Apr 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1291,7 +1291,8 @@ Possible attributes are:
 	-range	    Range allowed, default is current line
 	-range=%    Range allowed, default is whole file (1,$)
 	-range=N    A count (default N) which is specified in the line
-		    number position (like |:split|)
+		    number position (like |:split|); allows for zero line
+		    number.
 	-count=N    A count (default N) which is specified either in the line
 		    number position, or as an initial argument (like |:Next|).
 		    Specifying -count (without a default) acts like -count=0
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 166c0aaad..a367e06b7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2011 Mar 22
+*options.txt*	For Vim version 7.3.  Last change: 2011 Apr 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5907,9 +5907,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	For Unix the default it "| tee".  The stdout of the compiler is saved
 	in a file and echoed to the screen.  If the 'shell' option is "csh" or
 	"tcsh" after initializations, the default becomes "|& tee".  If the
-	'shell' option is "sh", "ksh", "zsh" or "bash" the default becomes
-	"2>&1| tee".  This means that stderr is also included.  Before using
-	the 'shell' option a path is removed, thus "/bin/sh" uses "sh".
+	'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh" or "bash" the
+	default becomes "2>&1| tee".  This means that stderr is also included.
+	Before using the 'shell' option a path is removed, thus "/bin/sh" uses
+	"sh".
 	The initialization of this option is done after reading the ".vimrc"
 	and the other initializations, so that when the 'shell' option is set
 	there, the 'shellpipe' option changes automatically, unless it was
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 0fd31d658..84cd7360a 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.3.  Last change: 2011 Feb 25
+*pattern.txt*   For Vim version 7.3.  Last change: 2011 Apr 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -651,6 +651,13 @@ overview.
 	"foobar" you could use "\(foo\)\@!...bar", but that doesn't match a
 	bar at the start of a line.  Use "\(foo\)\@<!bar".
 
+	Useful example: to find "foo" in a line that does not contain "bar": >
+		/^\%(.*bar\)\@!.*\zsfoo
+<	This pattern first checks that there is not a single position in the
+	line where "bar" matches.  If ".*bar" matches somewhere the \@! will
+	reject the pattern.  When there is no match any "foo" will be found.
+	The "\zs" is to have the match start just before "foo".
+
 							*/\@<=*
 \@<=	Matches with zero width if the preceding atom matches just before what
 	follows. |/zero-width| {not in Vi}
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 6c3927410..c30926715 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.3.  Last change: 2011 Apr 01
+*syntax.txt*	For Vim version 7.3.  Last change: 2011 Apr 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -468,18 +468,28 @@ disabled javascript to view closed folds. To use this option, use: >
 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: >
+By default "<pre>" and "</pre>" are used around the text. When 'wrap' is set
+in the window being converted, the CSS 2.0 "white-space:pre-wrap" value is
+used to wrap the text. You can explicitly enable the wrapping with: >
+   :let g:html_pre_wrap = 1
+or disable with >
+   :let g:html_pre_wrap = 0
+This generates HTML that looks very close to the Vim window, but unfortunately
+there can be minor differences such as the lack of a 'showbreak' option in in
+the HTML, or where line breaks can occur.
+
+Another way to obtain text wrapping in the HTML, at the risk of making some
+things look even more different, is to use: >
    :let g:html_no_pre = 1
 This will use <br> at the end of each line and use "&nbsp;" for repeated
-spaces.
+spaces. Doing it this way is more compatible with old browsers, but modern
+browsers support the "white-space" method.
 
-If you do use the "<pre>" tags, <Tab> characters in the text are included in
-the generated output if they will have no effect on the appearance of the
-text and it looks like they are in the document intentionally. This allows for
-the HTML output to be copied and pasted from a browser without losing the
-actual whitespace used in the document.
+If you do stick with the default "<pre>" tags, <Tab> characters in the text
+are included in the generated output if they will have no effect on the
+appearance of the text and it looks like they are in the document
+intentionally. This allows for the HTML output to be copied and pasted from a
+browser without losing the actual whitespace used in the document.
 
 Specifically, <Tab> characters will be included if the 'tabstop' option is set
 to the default of 8, 'expandtab' is not set, and if neither the foldcolumn nor
@@ -502,13 +512,14 @@ inserted lines as with the side-by-side diff, use: >
     :let g:html_whole_filler = 1
 And to go back to displaying up to three lines again: >
     :unlet g:html_whole_filler
-<
-TOhtml uses the current value of 'fileencoding' if set, or 'encoding' if not,
-to determine the charset and 'fileencoding' of the HTML file. In general, this
-works for the encodings mentioned specifically by name in |encoding-names|, but
-TOhtml will only automatically use those encodings which are widely supported.
-However, you can override this to support specific encodings that may not be
-automatically detected by default.
+
+For most buffers, TOhtml uses the current value of 'fileencoding' if set, or
+'encoding' if not, to determine the charset and 'fileencoding' of the HTML
+file. 'encoding' is always used for certain 'buftype' values. In general, this
+works for the encodings mentioned specifically by name in |encoding-names|,
+but TOhtml will only automatically use those encodings which are widely
+supported. However, you can override this to support specific encodings that
+may not be automatically detected by default.
 
 To overrule all automatic charset detection, set g:html_use_encoding to the
 name of the charset to be used. TOhtml will try to determine the appropriate
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index f7a96b616..3adc36cc2 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2011 Apr 01
+*todo.txt*      For Vim version 7.3.  Last change: 2011 Apr 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,14 +30,11 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Improvement patch for filetype.vim. (Thilo Six, 2011 Mar 19)
+Go through more coverity reports.
 
-Patch to recognize more files as log files. (Mathieu Parent, 2011 Jan 14)
+Patch for behavior of :cwindow. (Ingo Karkat, 2011 Apr 15)
 
-Two patches for xxd. (Florian Zumbiehl, 2011 Jan 11)
-Two updates for second one Jan 12.
-
-Go through new coverity reports.
+Configure fix for finding exctags. (Hong Xu, 2011 Aprl 2)
 
 When 'colorcolumn' is set locally to a window, ":new" opens a window with the
 same highlighting but 'colorcolumn' is empty. (Tyru, 2010 Nov 15)
@@ -45,11 +42,30 @@ Patch by Christian Brabandt, 2011 Feb 13 (but move further down).
 
 Patch for configure related to Ruby on Mac OS X. (Bjorn Winckler, 2011 Jan 14)
 
+Patch to make mkdir() work properly for different encodings. (Yukihiro
+Nakadaira, 2011 Apr 23)
+
+Updated PHP syntax file. (Jason Woofenden, 2011 Apr 22)
+
+ASCII Vim logo's (Erling Westenvik, 2011 Apr 19)  Add to website.
+
+Crash in autocomplete, valgrind log. (Greg Weber, 2011 Apr 22)
+
+Patch for static code analysis errors in riscOS. (Dominique Pelle, 2010 Dec 3)
+
 Patch to set v:register on startup. (Ingo Karkat, 2011 Jan 16)
 
+Risc OS gui has obvious errors.  Drop it?
+
 Patch to set v:register default depending on "unnamed" in 'clipboard'. (Ingo
 Karkat, 2011 Jan 16)
 
+Patch to add 'cscoperelative'. (Raghavendra Prabhu, 2011 Apr 18)
+
+New syntax file for dnsmasq. (Thilo Six, 2011 Apr 18)
+
+Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
+
 Patch for:
     InsertCharPre   - user typed character Insert mode, before inserting the
 		      char.  Pattern is matched with text before the cursor.
@@ -119,6 +135,21 @@ only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
 
 Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20)
 
+In GTK Gvim, setting 'lines' and 'columns' to 99999 causes a crash (Tony
+Mechelynck, 2011 Apr 25).  Can reproduce the crash sometimes:
+   gvim -N -u NONE --cmd 'set lines=99999 columns=99999'
+(gvim:25968): Gdk-WARNING **: Native Windows wider or taller than 65535 pixels are not supported
+The program 'gvim' received an X Window System error.
+This probably reflects a bug in the program.
+The error was 'RenderBadPicture (invalid Picture parameter)'.
+  (Details: serial 313 error_code 161 request_code 149 minor_code 8)
+  (Note to programmers: normally, X errors are reported asynchronously;
+   that is, you will receive the error a while after causing it.
+   To debug your program, run it with the --sync command line
+   option to change this behavior. You can then get a meaningful
+   backtrace from your debugger if you break on the gdk_x_error() function.)
+Check that number of pixels doesn't go above 65535?
+
 CursorHold repeats typed key when it's the start of a mapping.
 (Will Gray, 2011 Mar 23)
 
@@ -204,8 +235,6 @@ Version of netbeans.c for use with MacVim. (Kazuki Sakamoto, 2010 Nov 18)
 there is one backslash. (Ray Frush, 2010 Nov 18)  What does the original ex
 do?
 
-":find" completion does not escape space in directory name. (Isz, 2010 Nov 2)
-
 Searching mixed with Visual mode doesn't redraw properly. (James Vega, 2010 Nov
 22)
 
@@ -411,8 +440,6 @@ Undo problem: line not removed as expected when using setline() from Insert
 mode. (Israel Chauca, 2010 May 13, more in second msg)
 Break undo when CTRL-R = changes the text?  Or save more lines?
 
-Patch for static code analysis errors in riscOS. (Dominique Pelle, 2010 Dec 3)
-
 Patch for better #if 0 syntax highlighting for C code. (Ben Schmidt, 2011 Jan
 20)
 
@@ -1402,9 +1429,6 @@ In gvim the backspace key produces a backspace character, but on Linux the
 VERASE key is Delete.  Set VERASE to Backspace? (patch by Stephane Chazelas,
 2007 Oct 16)
 
-When entering a C /* comment, after typing <Enter> for 70 times the indent
-disappears. (Vincent Beffara, 2008 Jul 3)
-
 TermResponse autocommand isn't always triggered when using vimdiff. (Aron
 Griffis, 2007 Sep 19)
 
@@ -3768,6 +3792,7 @@ Insert mode:
 7   Use CTRL-G <count> to repeat what follows.  Useful for inserting a
     character multiple times or repeating CTRL-Y.
 -   Make 'revins' work in Replace mode.
+9   Can't use multi-byte characters for 'matchpairs'.
 7   Use 'matchpairs' for 'showmatch': When inserting a character check if it
     appears in the rhs of 'matchpairs'.
 -   In Insert mode (and command line editing?): Allow undo of the last typed
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0d78a940e..28507b3f1 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:	2011 Apr 01
+" Last Change:	2011 Apr 28
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -123,7 +123,7 @@ au BufNewFile,BufRead *.am
 	\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
 
 " ALSA configuration
-au BufNewFile,BufRead ~/.asoundrc,/usr/share/alsa/alsa.conf,*/etc/asound.conf	setf alsaconf
+au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
 
 " Arc Macro Language
 au BufNewFile,BufRead *.aml			setf aml
@@ -156,7 +156,7 @@ au BufNewFile,BufRead *.asp
 	\ endif
 
 " Grub (must be before catch *.lst)
-au BufNewFile,BufRead /boot/grub/menu.lst,/boot/grub/grub.conf,*/etc/grub.conf	setf grub
+au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
 
 " Assembly (all kinds)
 " *.lst is not pure assembly, it has two extra columns (address, byte codes)
@@ -316,9 +316,6 @@ endfunc
 
 " Calendar
 au BufNewFile,BufRead calendar			setf calendar
-au BufNewFile,BufRead */.calendar/*,
-	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
-	\					call s:StarSetf('calendar')
 
 " C#
 au BufNewFile,BufRead *.cs			setf cs
@@ -330,7 +327,7 @@ au BufNewFile,BufRead *.cabal			setf cabal
 au BufNewFile,BufRead *.toc			setf cdrtoc
 
 " Cdrdao config
-au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,~/.cdrdao	setf cdrdaoconf
+au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao	setf cdrdaoconf
 
 " Cfengine
 au BufNewFile,BufRead cfengine.conf		setf cfengine
@@ -487,7 +484,7 @@ au BufNewFile,BufRead *.prg
 au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in		setf cmake
 
 " Cmusrc
-au BufNewFile,BufRead ~/.cmus/{autosave,rc,command-history,*.theme} setf cmusrc
+au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme} setf cmusrc
 au BufNewFile,BufRead */cmus/{rc,*.theme}			setf cmusrc
 
 " Cobol
@@ -558,6 +555,9 @@ au BufNewFile,BufRead */etc/apt/sources.list.d/*.list	setf debsources
 " Deny hosts
 au BufNewFile,BufRead denyhosts.conf		setf denyhosts
 
+" dnsmasq(8) configuration files
+au BufNewFile,BufRead dnsmasq.conf		setf dnsmasq
+
 " ROCKLinux package description
 au BufNewFile,BufRead *.desc			setf desc
 
@@ -728,14 +728,14 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
 " Git
-autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
-autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
-autocmd BufNewFile,BufRead git-rebase-todo      setf gitrebase
-autocmd BufNewFile,BufRead .msg.[0-9]*
+au BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
+au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
+au BufNewFile,BufRead git-rebase-todo      setf gitrebase
+au BufNewFile,BufRead .msg.[0-9]*
       \ if getline(1) =~ '^From.*# This line is ignored.$' |
       \   setf gitsendemail |
       \ endif
-autocmd BufNewFile,BufRead *.git/**
+au BufNewFile,BufRead *.git/**
       \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
       \   setf git |
       \ endif
@@ -749,7 +749,10 @@ au BufNewFile,BufRead *.gp,.gprc		setf gp
 " GPG
 au BufNewFile,BufRead */.gnupg/options		setf gpg
 au BufNewFile,BufRead */.gnupg/gpg.conf		setf gpg
-au BufNewFile,BufRead /usr/**/gnupg/options.skel setf gpg
+au BufNewFile,BufRead */usr/**/gnupg/options.skel setf gpg
+
+" gnash(1) configuration files
+au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
 
 " Gnuplot scripts
 au BufNewFile,BufRead *.gpi			setf gnuplot
@@ -980,7 +983,7 @@ au BufNewFile,BufRead lftp.conf,.lftprc,*lftp/rc	setf lftp
 au BufNewFile,BufRead *.ll			setf lifelines
 
 " Lilo: Linux loader
-au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
+au BufNewFile,BufRead lilo.conf			setf lilo
 
 " Lisp (*.el = ELisp, *.cl = Common Lisp, *.jl = librep Lisp)
 if has("fname_case")
@@ -1103,7 +1106,7 @@ au BufNewFile,BufRead *.mel			setf mel
 au BufNewFile,BufRead *.hgrc,*hgrc		setf cfg
 
 " Messages (logs mostly)
-autocmd BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.*[0-9]*} setf messages
+au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
 
 " Metafont
 au BufNewFile,BufRead *.mf			setf mf
@@ -1159,11 +1162,7 @@ au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
 au BufNewFile,BufRead *.moo			setf moo
 
 " Modconf
-au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules	setf modconf
-au BufNewFile,BufRead */etc/modutils/*
-	\ if executable(expand("<afile>")) != 1
-	\|  call s:StarSetf('modconf')
-	\|endif
+au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
 
 " Mplayer config
 au BufNewFile,BufRead mplayer.conf,*/.mplayer/config	setf mplayerconf
@@ -1180,6 +1179,9 @@ au BufNewFile,BufRead *.msql			setf msql
 " Mysql
 au BufNewFile,BufRead *.mysql			setf mysql
 
+" Mutt setup files (must be before catch *.rc)
+au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+
 " M$ Resource files
 au BufNewFile,BufRead *.rc			setf rc
 
@@ -1588,8 +1590,7 @@ func! s:FTr()
 endfunc
 
 " Remind
-au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
-au BufNewFile,BufRead *.remind,*.rem		setf remind
+au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
 
 " Resolv.conf
 au BufNewFile,BufRead resolv.conf		setf resolv
@@ -2230,7 +2231,7 @@ au BufEnter *.xpm2				setf xpm2
 " XFree86 config
 au BufNewFile,BufRead XF86Config
 	\ if getline(1) =~ '\<XConfigurator\>' |
-	\   let b:xf86c_xfree86_version = 3 |
+	\   let b:xf86conf_xfree86_version = 3 |
 	\ endif |
 	\ setf xf86conf
 au BufNewFile,BufRead */xorg.conf.d/*.conf
@@ -2386,6 +2387,11 @@ au BufNewFile,BufRead bzr_log.*			setf bzr
 " BIND zone
 au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
 
+" Calendar
+au BufNewFile,BufRead */.calendar/*,
+	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
+	\					call s:StarSetf('calendar')
+
 " Changelog
 au BufNewFile,BufRead [cC]hange[lL]og*
 	\ if getline(1) =~ '; urgency='
@@ -2397,6 +2403,9 @@ au BufNewFile,BufRead [cC]hange[lL]og*
 " Crontab
 au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*		call s:StarSetf('crontab')
 
+" dnsmasq(8) configuration
+au BufNewFile,BufRead */etc/dnsmasq.d/*		call s:StarSetf('dnsmasq')
+
 " Dracula
 au BufNewFile,BufRead drac.*			call s:StarSetf('dracula')
 
@@ -2412,7 +2421,7 @@ au BufNewFile,BufRead *fvwm2rc*
 	\|endif
 
 " Gedcom
-au BufNewFile,BufRead /tmp/lltmp*		call s:StarSetf('gedcom')
+au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
 
 " GTK RC
 au BufNewFile,BufRead .gtkrc*,gtkrc*		call s:StarSetf('gtkrc')
@@ -2429,6 +2438,9 @@ au! BufNewFile,BufRead *jarg*
 " Kconfig
 au BufNewFile,BufRead Kconfig.*			call s:StarSetf('kconfig')
 
+" Lilo: Linux loader
+au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
+
 " Logcheck
 au BufNewFile,BufRead */etc/logcheck/*.d*/*	call s:StarSetf('logcheck')
 
@@ -2442,6 +2454,10 @@ au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')
 au BufNewFile,BufRead mutt[[:alnum:]._-]\{6\}	setf mail
 
 " Modconf
+au BufNewFile,BufRead */etc/modutils/*
+	\ if executable(expand("<afile>")) != 1
+	\|  call s:StarSetf('modconf')
+	\|endif
 au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
 
 " Mutt setup file
@@ -2464,6 +2480,9 @@ au BufNewFile,BufRead *termcap*
 	\|  let b:ptcap_type = "term" | call s:StarSetf('ptcap')
 	\|endif
 
+" Remind
+au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
+
 " Vim script
 au BufNewFile,BufRead *vimrc*			call s:StarSetf('vim')
 
diff --git a/runtime/ftplugin/pascal.vim b/runtime/ftplugin/pascal.vim
index 3b1db4abd..5ff18b960 100644
--- a/runtime/ftplugin/pascal.vim
+++ b/runtime/ftplugin/pascal.vim
@@ -1,14 +1,19 @@
 " Vim filetype plugin file
 " Language:	pascal
 " Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Changed: 20 Jan 2009
+" Last Changed: 11 Apr 2011
 " URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 if exists("loaded_matchit")
-    let b:match_words='\<\%(begin\|case\|try\)\>:\<end\>'
+    let b:match_ignorecase = 1 " (pascal is case-insensitive)
+
+    let b:match_words = '\<\%(begin\|case\|record\|object\|try\)\>'
+    let b:match_words .= ':\<^\s*\%(except\|finally\)\>:\<end\>'
+    let b:match_words .= ',\<repeat\>:\<until\>'
+    let b:match_words .= ',\<if\>:\<else\>'
 endif
 
 " Undo the stuff we changed.
diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim
index ece30105c..8e3810708 100644
--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
@@ -1,11 +1,20 @@
 " Vim plugin for converting a syntax highlighted file to HTML.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 Jan 06
+" Last Change: 2011 Apr 09
 "
 " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
 " $VIMRUNTIME/syntax/2html.vim
 "
 " TODO:
+"   * Options for generating the CSS in external style sheets. New :TOcss
+"     command to convert the current color scheme into a (mostly) generic CSS
+"     stylesheet which can be re-used. Alternate stylesheet support?
+"   * Pull in code from http://www.vim.org/scripts/script.php?script_id=3113 :
+"	- listchars support
+"	- full-line background highlight
+"	- other?
+"   * Font auto-detection similar to
+"     http://www.vim.org/scripts/script.php?script_id=2384
 "   * Explicitly trigger IE8+ Standards Mode?
 "   * Make it so deleted lines in a diff don't create side-scrolling
 "   * Restore open/closed folds and cursor position after processing each file
@@ -19,7 +28,12 @@
 "
 "
 " Changelog:
-"   7.3_v8 (this version): Add html_expand_tabs option to allow leaving tab
+"   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.
@@ -61,7 +75,7 @@
 if exists('g:loaded_2html_plugin')
   finish
 endif
-let g:loaded_2html_plugin = 'vim7.3_v8'
+let g:loaded_2html_plugin = 'vim7.3_v9'
 
 " Define the :TOhtml command when:
 " - 'compatible' is not set
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index d37ca1aad..6b22c81cd 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 Jan 06
+" Last Change: 2011 Apr 05
 "
 " Additional contributors:
 "
@@ -33,6 +33,13 @@ endif
 
 let s:settings = tohtml#GetUserSettings()
 
+" Whitespace
+if s:settings.pre_wrap
+  let s:whitespace = "white-space: pre-wrap; "
+else
+  let s:whitespace = ""
+endif
+
 " When not in gui we can only guess the colors.
 if has("gui_running")
   let s:whatterm = "gui"
@@ -1048,10 +1055,14 @@ if s:settings.use_css
   if s:settings.no_pre
     execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e"
   else
-    execute "normal! A\npre { font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e"
+    execute "normal! A\npre { " . s:whitespace . "font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e"
     yank
     put
     execute "normal! ^cwbody\e"
+    " body should not have the wrap formatting, only the pre section
+    if s:whitespace != ''
+      exec 's#'.s:whitespace
+    endif
   endif
 else
   execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '">\r<font face="'. s:htmlfont .'">'
@@ -1160,7 +1171,7 @@ let &l:winfixheight = s:old_winfixheight
 let &ls=s:ls
 
 " Save a little bit of memory (worth doing?)
-unlet s:htmlfont
+unlet s:htmlfont s:whitespace
 unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search
 unlet s:old_magic s:old_more s:old_fdm s:old_fen s:old_winheight
 unlet! s:old_isprint
diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim
index 117f98d75..74ab5615c 100644
--- a/runtime/syntax/crontab.vim
+++ b/runtime/syntax/crontab.vim
@@ -5,8 +5,7 @@
 " License: This file can be redistribued and/or modified under the same terms
 "   as Vim itself.
 " Filenames: /tmp/crontab.* used by "crontab -e"
-" URL: http://trific.ath.cx/Ftp/vim/syntax/crontab.vim
-" Last Change: 2006-04-20
+" Last Change: 2011-04-21
 "
 " crontab line format:
 " Minutes   Hours   Days   Months   Days_of_Week   Commands # comments
@@ -23,12 +22,14 @@ syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite
 syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite contained
 syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained
 
+syntax case ignore
 syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained
 syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec
 
 syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained
 syntax keyword crontabDow7 contained sun mon tue wed thu fri sat
 
+syntax case match
 syntax region crontabCmd start="\S" end="$" skipwhite contained keepend contains=crontabPercent
 syntax match crontabCmnt "^\s*#.*"
 syntax match crontabPercent "[^\\]%.*"lc=1 contained
diff --git a/runtime/syntax/dirpager.vim b/runtime/syntax/dirpager.vim
new file mode 100644
index 000000000..216bfd767
--- /dev/null
+++ b/runtime/syntax/dirpager.vim
@@ -0,0 +1,33 @@
+" Vim syntax file
+" Language:         directory pager
+" Maintainer:       Thilo Six <T.Six@gmx.de>
+" Derived From:	    Nikolai Weibull's dircolors.vim
+" Latest Revision:  2011-04-09
+"
+" usage: $ ls -la | view -c "set ft=dirpager" -
+"
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+setlocal nowrap
+
+syn keyword  DirPagerTodo	contained FIXME TODO XXX NOTE
+
+syn region   DirPagerExe	start='^...x\|^......x\|^.........x' end='$'	contains=DirPagerTodo,@Spell
+syn region   DirPagerDir	start='^d' end='$'	contains=DirPagerTodo,@Spell
+syn region   DirPagerLink	start='^l' end='$'	contains=DirPagerTodo,@Spell
+
+hi def link  DirPagerTodo	Todo
+hi def	     DirPagerExe	ctermfg=Green	    guifg=Green
+hi def	     DirPagerDir	ctermfg=Blue	    guifg=Blue
+hi def	     DirPagerLink	ctermfg=Cyan	    guifg=Cyan
+
+let b:current_syntax = "dirpager"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim
new file mode 100644
index 000000000..e6976201f
--- /dev/null
+++ b/runtime/syntax/dnsmasq.vim
@@ -0,0 +1,104 @@
+" Vim syntax file
+" Language:	dnsmasq(8) configuration file
+" Maintainer:	Thilo Six <T.Six@gmx.de>
+" Last Change:	2011 Apr 28
+" Credits:	This file is a mix of cfg.vim, wget.vim and xf86conf.vim, credits go to:
+"		Igor N. Prischepoff
+"		Doug Kearns
+"		David Ne\v{c}as
+"
+" Options: 	let dnsmasq_backrgound_light = 1
+"
+
+" 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
+
+if !exists("b:dnsmasq_backrgound_light")
+	if exists("dnsmasq_backrgound_light")
+		let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light
+	else
+		let b:dnsmasq_backrgound_light = 0
+	endif
+endif
+
+
+" case on
+syn case match
+
+"Parameters
+syn match   DnsmasqParams   "^.\{-}="me=e-1 contains=DnsmasqComment
+"... and their values (don't want to highlight '=' sign)
+syn match   DnsmasqValues   "=.*"hs=s+1 contains=DnsmasqComment,DnsmasqSpecial
+
+"...because we do it here.
+syn match   DnsmasqEq	    display '=\|@\|/\|,' nextgroup=DnsmasqValues
+
+syn match   DnsmasqSpecial    "#"
+
+" String
+syn match   DnsmasqString    "\".*\""
+syn match   DnsmasqString    "'.*'"
+
+" Comments
+syn match   DnsmasqComment   "^#.*$" contains=DnsmasqTodo
+syn match   DnsmasqComment   "[ \t]#.*$" contains=DnsmasqTodo
+
+syn keyword DnsmasqTodo	    FIXME TODO XXX NOT contained
+
+syn match DnsmasqKeyword    "^\s*add-mac\>"
+syn match DnsmasqKeyword    "^\s*all-servers\>"
+syn match DnsmasqKeyword    "^\s*bind-interfaces\>"
+syn match DnsmasqKeyword    "^\s*bogus-priv\>"
+syn match DnsmasqKeyword    "^\s*clear-on-reload\>"
+syn match DnsmasqKeyword    "^\s*dhcp-authoritative\>"
+syn match DnsmasqKeyword    "^\s*dhcp-fqdn\>"
+syn match DnsmasqKeyword    "^\s*dhcp-no-override\>"
+syn match DnsmasqKeyword    "^\s*dhcp-scriptuser\>"
+syn match DnsmasqKeyword    "^\s*domain-needed\>"
+syn match DnsmasqKeyword    "^\s*enable-dbus\>"
+syn match DnsmasqKeyword    "^\s*enable-tftp\>"
+syn match DnsmasqKeyword    "^\s*expand-hosts\>"
+syn match DnsmasqKeyword    "^\s*filterwin2k\>"
+syn match DnsmasqKeyword    "^\s*keep-in-foreground\>"
+syn match DnsmasqKeyword    "^\s*leasefile-ro\>"
+syn match DnsmasqKeyword    "^\s*localise-queries\>"
+syn match DnsmasqKeyword    "^\s*localmx\>"
+syn match DnsmasqKeyword    "^\s*log-dhcp\>"
+syn match DnsmasqKeyword    "^\s*log-queries\>"
+syn match DnsmasqKeyword    "^\s*no-daemon\>"
+syn match DnsmasqKeyword    "^\s*no-hosts\>"
+syn match DnsmasqKeyword    "^\s*no-negcache\>"
+syn match DnsmasqKeyword    "^\s*no-ping\>"
+syn match DnsmasqKeyword    "^\s*no-poll\>"
+syn match DnsmasqKeyword    "^\s*no-resolv\>"
+syn match DnsmasqKeyword    "^\s*proxy-dnssec\>"
+syn match DnsmasqKeyword    "^\s*read-ethers\>"
+syn match DnsmasqKeyword    "^\s*rebind-localhost-ok\>"
+syn match DnsmasqKeyword    "^\s*selfmx\>"
+syn match DnsmasqKeyword    "^\s*stop-dns-rebind\>"
+syn match DnsmasqKeyword    "^\s*strict-order\>"
+syn match DnsmasqKeyword    "^\s*tftp-no-blocksize\>"
+syn match DnsmasqKeyword    "^\s*tftp-secure\>"
+syn match DnsmasqKeyword    "^\s*tftp-unique-root\>"
+
+
+if b:dnsmasq_backrgound_light == 1
+    hi def DnsmasqParams    ctermfg=DarkGreen guifg=DarkGreen
+    hi def DnsmasqKeyword   ctermfg=DarkGreen guifg=DarkGreen
+else
+    hi def link DnsmasqKeyword  Keyword
+    hi def link DnsmasqParams   Keyword
+endif
+hi def link DnsmasqTodo	    Todo
+hi def link DnsmasqSpecial  Constant
+hi def link DnsmasqComment  Comment
+hi def link DnsmasqString   Constant
+hi def link DnsmasqValues   Normal
+hi def link DnsmasqEq	    Constant
+
+let b:current_syntax = "dnsmasq"
diff --git a/runtime/syntax/gnash.vim b/runtime/syntax/gnash.vim
new file mode 100644
index 000000000..413ebaa64
--- /dev/null
+++ b/runtime/syntax/gnash.vim
@@ -0,0 +1,99 @@
+" Vim syntax file
+" Language: 	gnash(1) configuration files
+"		http://www.gnu.org/software/gnash/manual/gnashuser.html#gnashrc
+" Maintainer: 	Thilo Six <T.Six@gmx.de>
+" Last Change: 	2011 Apr 28
+" Credidts:	derived from readline.vim
+"		Nikolai Weibull
+"
+
+" 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
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+
+syn case match
+
+syn keyword GnashTodo	    contained TODO FIXME XXX NOTE
+
+syn region  GnashComment    display oneline start='^\s*#' end='$'
+                                \ contains=GnashTodo,@Spell
+
+syn match   GnashNumber	    display '\<\d\+\>'
+
+syn case ignore
+syn keyword GnashOn	    ON YES TRUE
+syn keyword GnashOff	    OFF NO FALSE
+syn case match
+
+syn match GnashSet	    '^\s*set\>'
+syn match GnashSet	    '^\s*append\>'
+
+syn match GnashKeyword	    '\<CertDir\>'
+syn match GnashKeyword      '\<ASCodingErrorsVerbosity\>'
+syn match GnashKeyword      '\<CertFile\>'
+syn match GnashKeyword      '\<EnableExtensions\>'
+syn match GnashKeyword      '\<HWAccel\>'
+syn match GnashKeyword      '\<LCShmKey\>'
+syn match GnashKeyword      '\<LocalConnection\>'
+syn match GnashKeyword      '\<MalformedSWFVerbosity\>'
+syn match GnashKeyword      '\<Renderer\>'
+syn match GnashKeyword      '\<RootCert\>'
+syn match GnashKeyword      '\<SOLReadOnly\>'
+syn match GnashKeyword      '\<SOLSafeDir\>'
+syn match GnashKeyword      '\<SOLreadonly\>'
+syn match GnashKeyword      '\<SOLsafedir\>'
+syn match GnashKeyword      '\<StartStopped\>'
+syn match GnashKeyword      '\<StreamsTimeout\>'
+syn match GnashKeyword      '\<URLOpenerFormat\>'
+syn match GnashKeyword      '\<XVideo\>'
+syn match GnashKeyword      '\<actionDump\>'
+syn match GnashKeyword      '\<blacklist\>'
+syn match GnashKeyword      '\<debugger\>'
+syn match GnashKeyword      '\<debuglog\>'
+syn match GnashKeyword      '\<delay\>'
+syn match GnashKeyword      '\<enableExtensions\>'
+syn match GnashKeyword      '\<flashSystemManufacturer\>'
+syn match GnashKeyword      '\<flashSystemOS\>'
+syn match GnashKeyword      '\<flashVersionString\>'
+syn match GnashKeyword      '\<ignoreFSCommand\>'
+syn match GnashKeyword      '\<ignoreShowMenu\>'
+syn match GnashKeyword      '\<insecureSSL\>'
+syn match GnashKeyword      '\<localSandboxPath\>'
+syn match GnashKeyword      '\<localdomain\>'
+syn match GnashKeyword      '\<localhost\>'
+syn match GnashKeyword      '\<microphoneDevice\>'
+syn match GnashKeyword      '\<parserDump\>'
+syn match GnashKeyword      '\<pluginsound\>'
+syn match GnashKeyword      '\<quality\>'
+syn match GnashKeyword      '\<solLocalDomain\>'
+syn match GnashKeyword      '\<sound\>'
+syn match GnashKeyword      '\<splashScreen\>'
+syn match GnashKeyword      '\<startStopped\>'
+syn match GnashKeyword      '\<streamsTimeout\>'
+syn match GnashKeyword      '\<urlOpenerFormat\>'
+syn match GnashKeyword      '\<verbosity\>'
+syn match GnashKeyword      '\<webcamDevice\>'
+syn match GnashKeyword      '\<whitelist\>'
+syn match GnashKeyword      '\<writelog\>'
+
+hi def GnashOn		    ctermfg=Green guifg=Green
+hi def GnashOff		    ctermfg=Red   guifg=Red
+hi def link GnashComment    Comment
+hi def link GnashTodo	    Todo
+hi def link GnashString	    String
+hi def link GnashNumber	    Normal
+hi def link GnashSet	    String
+hi def link GnashKeyword    Keyword
+
+let b:current_syntax = "gnash"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/syntax/idlang.vim b/runtime/syntax/idlang.vim
index 9d567e5f8..670d080a7 100644
--- a/runtime/syntax/idlang.vim
+++ b/runtime/syntax/idlang.vim
@@ -1,6 +1,6 @@
 " Interactive Data Language syntax file (IDL, too  [:-)]
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
-" Last change: 2003 Apr 25
+" Last change: 2011 Apr 11
 " Created by: Hermann Rochholz <Hermann.Rochholz AT gmx.de>
 
 " Remove any old syntax stuff hanging around
@@ -113,7 +113,7 @@ syn keyword idlangRoutine EXPAND_PATH EXPINT EXTRAC EXTRACT_SLICE F_CVF
 syn keyword idlangRoutine F_PDF FACTORIAL FFT FILE_CHMOD FILE_DELETE
 syn keyword idlangRoutine FILE_EXPAND_PATH FILE_MKDIR FILE_TEST FILE_WHICH
 syn keyword idlangRoutine FILEPATH FINDFILE FINDGEN FINITE FIX FLICK FLOAT
-syn keyword idlangRoutine FLOOR FLOW3 FLTARR FLUSH FOR FORMAT_AXIS_VALUES
+syn keyword idlangRoutine FLOOR FLOW3 FLTARR FLUSH FORMAT_AXIS_VALUES
 syn keyword idlangRoutine FORWARD_FUNCTION FREE_LUN FSTAT FULSTR FUNCT
 syn keyword idlangRoutine FV_TEST FX_ROOT FZ_ROOTS GAMMA GAMMA_CT
 syn keyword idlangRoutine GAUSS_CVF GAUSS_PDF GAUSS2DFIT GAUSSFIT GAUSSINT
diff --git a/runtime/syntax/pov.vim b/runtime/syntax/pov.vim
index 700bb315d..4c1fd9624 100644
--- a/runtime/syntax/pov.vim
+++ b/runtime/syntax/pov.vim
@@ -1,9 +1,7 @@
 " Vim syntax file
-" This is a GENERATED FILE. Please always refer to source file at the URI below.
-" Language: PoV-Ray(tm) 3.5 Scene Description Language
-" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2003 Apr 25
-" URL: http://physics.muni.cz/~yeti/download/syntax/pov.vim
+" Language: PoV-Ray(tm) 3.7 Scene Description Language
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2011-04-23
 " Required Vim Version: 6.0
 
 " Setup
@@ -22,20 +20,21 @@ syn case match
 
 " Top level stuff
 syn keyword povCommands global_settings
-syn keyword povObjects array atmosphere background bicubic_patch blob box camera component cone cubic cylinder disc fog height_field isosurface julia_fractal lathe light_group light_source mesh mesh2 object parametric pattern photons plane poly polygon prism quadric quartic rainbow sky_sphere smooth_triangle sor sphere sphere_sweep spline superellipsoid text torus triangle
+syn keyword povObjects array atmosphere background bicubic_patch blob box camera component cone cubic cylinder disc fog height_field isosurface julia_fractal lathe light_group light_source mesh mesh2 object ovus parametric pattern photons plane poly polygon polynomial prism quadric quartic rainbow sky_sphere smooth_triangle sor sphere sphere_sweep spline superellipsoid text torus triangle
 syn keyword povCSG clipped_by composite contained_by difference intersection merge union
 syn keyword povAppearance interior material media texture interior_texture texture_list
 syn keyword povGlobalSettings ambient_light assumed_gamma charset hf_gray_16 irid_wavelength max_intersections max_trace_level number_of_waves radiosity noise_generator
 syn keyword povTransform inverse matrix rotate scale translate transform
 
 " Descriptors
-syn keyword povDescriptors finish normal pigment uv_mapping uv_vectors vertex_vectors
-syn keyword povDescriptors adc_bailout always_sample brightness count error_bound distance_maximum gray_threshold load_file low_error_factor max_sample media minimum_reuse nearest_count normal pretrace_end pretrace_start recursion_limit save_file
-syn keyword povDescriptors color colour gray rgb rgbt rgbf rgbft red green blue
+syn keyword povDescriptors finish inside_vector normal pigment uv_mapping uv_vectors vertex_vectors
+syn keyword povDescriptors adc_bailout always_sample brightness count error_bound distance_maximum gray_threshold load_file low_error_factor maximum_reuse max_sample media minimum_reuse mm_per_unit nearest_count normal pretrace_end pretrace_start recursion_limit save_file
+syn keyword povDescriptors color colour rgb rgbt rgbf rgbft srgb srgbf srgbt srgbft
+syn match povDescriptors "\<\(red\|green\|blue\|gray\)\>"
 syn keyword povDescriptors bump_map color_map colour_map image_map material_map pigment_map quick_color quick_colour normal_map texture_map image_pattern pigment_pattern
-syn keyword povDescriptors ambient brilliance conserve_energy crand diffuse fresnel irid metallic phong phong_size refraction reflection reflection_exponent roughness specular
-syn keyword povDescriptors cylinder fisheye omnimax orthographic panoramic perspective spherical ultra_wide_angle
-syn keyword povDescriptors agate average brick boxed bozo bumps cells checker crackle cylindrical dents facets function gradient granite hexagon julia leopard magnet mandel marble onion planar quilted radial ripples slope spherical spiral1 spiral2 spotted tiles tiles2 toroidal waves wood wrinkles
+syn keyword povDescriptors ambient brilliance conserve_energy crand diffuse fresnel irid metallic phong phong_size refraction reflection reflection_exponent roughness specular subsurface
+syn keyword povDescriptors cylinder fisheye mesh_camera omnimax orthographic panoramic perspective spherical ultra_wide_angle
+syn keyword povDescriptors agate aoi average brick boxed bozo bumps cells checker crackle cylindrical dents facets function gradient granite hexagon julia leopard magnet mandel marble onion pavement planar quilted radial ripples slope spherical spiral1 spiral2 spotted square tiles tile2 tiling toroidal triangular waves wood wrinkles
 syn keyword povDescriptors density_file
 syn keyword povDescriptors area_light shadowless spotlight parallel
 syn keyword povDescriptors absorption confidence density emission intervals ratio samples scattering variance
@@ -46,32 +45,35 @@ syn keyword povDescriptors target
 " Modifiers
 syn keyword povModifiers caustics dispersion dispersion_samples fade_color fade_colour fade_distance fade_power ior
 syn keyword povModifiers bounded_by double_illuminate hierarchy hollow no_shadow open smooth sturm threshold water_level
+syn keyword povModifiers importance no_radiosity
 syn keyword povModifiers hypercomplex max_iteration precision quaternion slice
 syn keyword povModifiers conic_sweep linear_sweep
 syn keyword povModifiers flatness type u_steps v_steps
-syn keyword povModifiers aa_level aa_threshold adaptive falloff jitter looks_like media_attenuation media_interaction method point_at radius tightness
-syn keyword povModifiers angle aperture blur_samples confidence direction focal_point h_angle location look_at right sky up v_angle variance
-syn keyword povModifiers all bump_size filter interpolate map_type once slope_map transmit use_alpha use_color use_colour use_index
+syn keyword povModifiers aa_level aa_threshold adaptive area_illumination falloff jitter looks_like media_attenuation media_interaction method point_at radius tightness
+syn keyword povModifiers angle aperture bokeh blur_samples confidence direction focal_point h_angle location look_at right sky up v_angle variance
+syn keyword povModifiers all bump_size gamma interpolate map_type once premultiplied slope_map use_alpha use_color use_colour use_index
+syn match povModifiers "\<\(filter\|transmit\)\>"
 syn keyword povModifiers black_hole agate_turb brick_size control0 control1 cubic_wave density_map flip frequency interpolate inverse lambda metric mortar octaves offset omega phase poly_wave ramp_wave repeat scallop_wave sine_wave size strength triangle_wave thickness turbulence turb_depth type warp
 syn keyword povModifiers eccentricity extinction
 syn keyword povModifiers arc_angle falloff_angle width
 syn keyword povModifiers accuracy all_intersections altitude autostop circular collect coords cutaway_textures dist_exp expand_thresholds exponent exterior gather global_lights major_radius max_trace no_bump_scale no_image no_reflection orient orientation pass_through precompute projected_through range_divider solid spacing split_union tolerance
 
 " Words not marked `reserved' in documentation, but...
-syn keyword povBMPType alpha gif iff jpeg pgm png pot ppm sys tga tiff contained
+syn keyword povBMPType alpha exr gif hdr iff jpeg pgm png pot ppm sys tga tiff
 syn keyword povFontType ttf contained
 syn keyword povDensityType df3 contained
 syn keyword povCharset ascii utf8 contained
 
 " Math functions on floats, vectors and strings
-syn keyword povFunctions abs acos acosh asc asin asinh atan atan2 atanh ceil cos cosh defined degrees dimensions dimension_size div exp file_exists floor int internal ln log max min mod pow radians rand seed select sin sinh sqrt strcmp strlen tan tanh val vdot vlength vstr vturbulence
+syn keyword povFunctions abs acos acosh asc asin asinh atan atan2 atanh bitwise_and bitwise_or bitwise_xor ceil cos cosh defined degrees dimensions dimension_size div exp file_exists floor inside int internal ln log max min mod pow prod radians rand seed select sin sinh sqrt strcmp strlen sum tan tanh val vdot vlength vstr vturbulence
 syn keyword povFunctions min_extent max_extent trace vcross vrotate vaxis_rotate vnormalize vturbulence
-syn keyword povFunctions chr concat substr str strupr strlwr
+syn keyword povFunctions chr concat datetime now substr str strupr strlwr
 syn keyword povJuliaFunctions acosh asinh atan cosh cube pwr reciprocal sinh sqr tanh
 
 " Specialities
-syn keyword povConsts clock clock_delta clock_on final_clock final_frame frame_number initial_clock initial_frame image_width image_height false no off on pi t true u v version x y yes z
-syn match povDotItem "\.\@<=\(blue\|green\|filter\|red\|transmit\|t\|u\|v\|x\|y\|z\)\>" display
+syn keyword povConsts clock clock_delta clock_on final_clock final_frame frame_number initial_clock initial_frame input_file_name image_width image_height false no off on pi true version yes
+syn match povConsts "\<[tuvxyz]\>"
+syn match povDotItem "\.\@<=\(blue\|green\|gray\|filter\|red\|transmit\|hf\|t\|u\|v\|x\|y\|z\)\>" display
 
 " Comments
 syn region povComment start="/\*" end="\*/" contains=povTodo,povComment
@@ -83,16 +85,18 @@ syn keyword povTodo TODO FIXME XXX NOT contained
 syn cluster povPRIVATE add=povTodo
 
 " Language directives
-syn match povConditionalDir "#\s*\(else\|end\|if\|ifdef\|ifndef\|switch\|while\)\>"
+syn match povConditionalDir "#\s*\(else\|end\|for\|if\|ifdef\|ifndef\|switch\|while\)\>"
 syn match povLabelDir "#\s*\(break\|case\|default\|range\)\>"
-syn match povDeclareDir "#\s*\(declare\|default\|local\|macro\|undef\|version\)\>"
+syn match povDeclareDir "#\s*\(declare\|default\|local\|macro\|undef\|version\)\>" nextgroup=povDeclareOption skipwhite
+syn keyword povDeclareOption deprecated once contained nextgroup=povDeclareOption skipwhite
 syn match povIncludeDir "#\s*include\>"
 syn match povFileDir "#\s*\(fclose\|fopen\|read\|write\)\>"
+syn keyword povFileDataType uint8 sint8 unit16be uint16le sint16be sint16le sint32le sint32be
 syn match povMessageDir "#\s*\(debug\|error\|render\|statistics\|warning\)\>"
 syn region povFileOpen start="#\s*fopen\>" skip=+"[^"]*"+ matchgroup=povOpenType end="\<\(read\|write\|append\)\>" contains=ALLBUT,PovParenError,PovBraceError,@PovPRIVATE transparent keepend
 
 " Literal strings
-syn match povSpecialChar "\\\d\d\d\|\\." contained
+syn match povSpecialChar "\\u\x\{4}\|\\\d\d\d\|\\." contained
 syn region povString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=povSpecialChar oneline
 syn cluster povPRIVATE add=povSpecialChar
 
@@ -112,7 +116,7 @@ hi def link povNumber Number
 hi def link povString String
 hi def link povFileOpen Constant
 hi def link povConsts Constant
-hi def link povDotItem Constant
+hi def link povDotItem povSpecial
 hi def link povBMPType povSpecial
 hi def link povCharset povSpecial
 hi def link povDensityType povSpecial
@@ -123,8 +127,10 @@ hi def link povSpecial Special
 hi def link povConditionalDir PreProc
 hi def link povLabelDir PreProc
 hi def link povDeclareDir Define
+hi def link povDeclareOption Define
 hi def link povIncludeDir Include
 hi def link povFileDir PreProc
+hi def link povFileDataType Special
 hi def link povMessageDir Debug
 hi def link povAppearance povDescriptors
 hi def link povObjects povDescriptors
diff --git a/runtime/syntax/povini.vim b/runtime/syntax/povini.vim
index 02169ea23..726fe1fc7 100644
--- a/runtime/syntax/povini.vim
+++ b/runtime/syntax/povini.vim
@@ -1,9 +1,7 @@
 " Vim syntax file
-" This is a GENERATED FILE. Please always refer to source file at the URI below.
-" Language: PoV-Ray(tm) 3.5 configuration/initialization files
-" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2002-06-01
-" URL: http://physics.muni.cz/~yeti/download/syntax/povini.vim
+" Language: PoV-Ray(tm) 3.7 configuration/initialization files
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2011-04-24
 " Required Vim Version: 6.0
 
 " Setup
@@ -25,15 +23,17 @@ syn match poviniInclude "^\s*[^[+-;]\S*\s*$" contains=poviniSection
 syn match poviniLabel "^.\{-1,}\ze=" transparent contains=poviniKeyword nextgroup=poviniBool,poviniNumber
 syn keyword poviniBool On Off True False Yes No
 syn match poviniNumber "\<\d*\.\=\d\+\>"
-syn keyword poviniKeyword Clock Initial_Frame Final_Frame Initial_Clock Final_Clock Subset_Start_Frame Subset_End_Frame Cyclic_Animation Field_Render Odd_Field
+syn keyword poviniKeyword Clock Initial_Frame Final_Frame Frame_Final Frame_Step Initial_Clock Final_Clock Subset_Start_Frame Subset_End_Frame Cyclic_Animation Clockless_Animation Real_Time_Raytracing Field_Render Odd_Field Work_Threads
 syn keyword poviniKeyword Width Height Start_Column Start_Row End_Column End_Row Test_Abort Test_Abort_Count Continue_Trace Create_Ini
-syn keyword poviniKeyword Display Video_Mode Palette Display_Gamma Pause_When_Done Verbose Draw_Vistas Preview_Start_Size Preview_End_Size
-syn keyword poviniKeyword Output_to_File Output_File_Type Output_Alpha Bits_Per_Color Output_File_Name Buffer_Output Buffer_Size
+syn keyword poviniKeyword Display Video_Mode Palette Display_Gamma Pause_When_Done Verbose Draw_Vistas Preview_Start_Size Preview_End_Size Render_Block_Size Render_Block_Step Render_Pattern Max_Image_Buffer_Memory
+syn keyword poviniKeyword Output_to_File Output_File_Type Output_Alpha Bits_Per_Color Output_File_Name Buffer_Output Buffer_Size Dither Dither_Method File_Gamma
+syn keyword poviniKeyword BSP_Base BSP_Child BSP_Isect BSP_Max BSP_Miss
 syn keyword poviniKeyword Histogram_Type Histogram_Grid_Size Histogram_Name
 syn keyword poviniKeyword Input_File_Name Include_Header Library_Path Version
 syn keyword poviniKeyword Debug_Console Fatal_Console Render_Console Statistic_Console Warning_Console All_Console Debug_File Fatal_File Render_File Statistic_File Warning_File All_File Warning_Level
-syn keyword poviniKeyword Quality Radiosity Bounding Bounding_Threshold Light_Buffer Vista_Buffer Remove_Bounds Split_Unions Antialias Sampling_Method Antialias_Threshold Jitter Jitter_Amount Antialias_Depth
+syn keyword poviniKeyword Quality Bounding Bounding_Method Bounding_Threshold Light_Buffer Vista_Buffer Remove_Bounds Split_Unions Antialias Sampling_Method Antialias_Threshold Jitter Jitter_Amount Antialias_Depth Antialias_Gamma
 syn keyword poviniKeyword Pre_Scene_Return Pre_Frame_Return Post_Scene_Return Post_Frame_Return User_Abort_Return Fatal_Error_Return
+syn keyword poviniKeyword Radiosity Radiosity_File_Name Radiosity_From_File Radiosity_To_File Radiosity_Vain_Pretrace High_Reproducibility
 syn match poviniShellOut "^\s*\(Pre_Scene_Command\|Pre_Frame_Command\|Post_Scene_Command\|Post_Frame_Command\|User_Abort_Command\|Fatal_Error_Command\)\>" nextgroup=poviniShellOutEq skipwhite
 syn match poviniShellOutEq "=" nextgroup=poviniShellOutRHS skipwhite contained
 syn match poviniShellOutRHS "[^;]\+" skipwhite contained contains=poviniShellOutSpecial
diff --git a/runtime/syntax/ratpoison.vim b/runtime/syntax/ratpoison.vim
index b1475600a..9fc59bec0 100644
--- a/runtime/syntax/ratpoison.vim
+++ b/runtime/syntax/ratpoison.vim
@@ -1,8 +1,9 @@
 " Vim syntax file
 " Language:	Ratpoison configuration/commands file ( /etc/ratpoisonrc ~/.ratpoisonrc )
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/ratpoison.vim
-" Last Change:	2005 Oct 06
+" Maintainer:	Magnus Woldrich <m@japh.se>
+" URL:		http://github.com/trapd00r/vim-syntax-ratpoison
+" Last Change:	2011 Apr 11
+" Previous Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -94,6 +95,13 @@ syn keyword ratpoisonSetArg	barpadding	contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	bgcolor
 syn keyword ratpoisonSetArg	border		contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	fgcolor
+syn keyword ratpoisonSetArg	fwcolor
+syn keyword ratpoisonSetArg	bwcolor
+syn keyword ratpoisonSetArg	historysize
+syn keyword ratpoisonSetArg	historycompaction
+syn keyword ratpoisonSetArg	historyexpansion
+syn keyword ratpoisonSetArg	topkmap
+syn keyword ratpoisonSetArg	barinpadding
 syn keyword ratpoisonSetArg	font
 syn keyword ratpoisonSetArg	framesels
 syn keyword ratpoisonSetArg	inputwidth	contained nextgroup=ratpoisonNumberArg
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index b35100c1b..3e9b56f0d 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -1,7 +1,7 @@
 " An example for a vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2008 Dec 17
+" Last change:	2011 Apr 15
 "
 " To use it, copy it to
 "     for Unix and OS/2:  ~/.vimrc
@@ -91,6 +91,6 @@ endif " has("autocmd")
 " file it was loaded from, thus the changes you made.
 " Only define it when not defined already.
 if !exists(":DiffOrig")
-  command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
+  command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
 		  \ | wincmd p | diffthis
 endif