Updated runtime files.

24 files changed, 186 insertions, 128 deletions

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index fcecab080b..e13ffb0dcd 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -744,7 +744,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- Reset the 'rightleft' option.
 	- Disable the use of 'keymap' (without changing its value).
 	Note that 'arabicshape' and 'delcombine' are not reset (it is a global
-	option.
+	option).
 	Also see |arabic.txt|.
 
 					*'arabicshape'* *'arshape'*
@@ -2130,7 +2130,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			and the cursor is right in front of the searched
 			character, the cursor won't move. When not included,
 			the cursor would skip over it and jump to the
-			following occurence.
+			following occurrence.
 
 	POSIX flags.  These are not included in the Vi default value, except
 	when $VIM_POSIX was set on startup. |posix|
@@ -6299,7 +6299,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Override the 'ignorecase' option if the search pattern contains upper
 	case characters.  Only used when the search pattern is typed and
 	'ignorecase' option is on.  Used for the commands "/", "?", "n", "N",
-	":g" and ":s".  Not used for "*", "#", "gd", tag search, etc..  After
+	":g" and ":s".  Not used for "*", "#", "gd", tag search, etc.  After
 	"*" and "#" you can make 'smartcase' used by doing a "/" command,
 	recalling the search pattern from history and hitting <Enter>.
 	NOTE: This option is reset when 'compatible' is set.
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 22562d70ba..0b38609242 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -913,8 +913,8 @@ Basic items
 	%n		error number (finds a number)
 	%m		error message (finds a string)
 	%r		matches the "rest" of a single-line file message %O/P/Q
-	%p		pointer line (finds a sequence of '-', '.' or ' ' and
-			uses the length for the column number)
+	%p		pointer line (finds a sequence of '-', '.', ' ' or
+			tabs and uses the length for the column number)
 	%*{conv}	any scanf non-assignable conversion
 	%%		the single '%' character
 	%s		search text (finds a string)
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index ba824ac8b8..a0b6b07f15 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2012 May 18
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Jun 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,27 +38,22 @@ Go through more coverity reports.
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
-Bug caused by patch 7.3.449. (Alex Afros, May 16)
-
-Add link to i/OS version on download page:
-http://applidium.com/en/applications/vim/
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
 Patch: home_replace() does not work whtn 8.3 filename. (Yasuhiro
 Matsumoto, 2012 Apr 18)  Asked for another version of the patch.
-Again May 18.
+Again May 18.  Update May 29 on github.  Does not handle multi-byte chars.
 
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
-Spell checking: "zg" doesn't pick up the "ß" character. (Axel Bender, 2012 May
-1)
-
 Win32: When a directory name contains an exclamation mark, completion doesn't
 complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5)
 
+Patch for this request: (Lech Lorens, 2012 May 26)
+7   Add 'j' flag to 'formatoptions': Remove comment leader when joining lines.
+
 Issue 54: document behavior of -complete, also expands arg.
 
 Cursor on wrong line after ":copen". (John Beckett, 2012 Apr 30)
@@ -75,18 +70,27 @@ Win32: When the taskbar is at the top of the screen creating the tabbar causes
 the window to move unnecessarily. (William E. Skeith III, 2012 Jan 12)
 Patch: 2012 Jan 13  Needs more work (2012 Feb 2)
 
+ml_get error when using syntastic plugin. (Alex Efros, 2012 May 24)
+Probably caused by recursive use of :lclose.
+May also crash Vim (May 25)
+Patch by Christian Brabandt, May 26.  Is this right?
+
+Help for b:undo_indent'. (Thilo Six, 2012 May 28)
+Also question if examples are correct.
+
+Docs patch for BufRead/BufReadPost. (Gary Johnson, 2012 May 28)
+
 URXVT:
 - will get stuck if byte sequence does not containe expected semicolon.
 - Use urxvt mouse support also in xterm.  Explanations:
   http://www.midnight-commander.org/ticket/2662
 
-Patches from Debian for python ftplugin. (Thilo Six, 2012 May 6)
-Also patches from Debian for Spanish translations.
-
 Patch for IBM z/OS makefile. (Stephen Bovy, 2012 Apr 26)
 Patch for configure (Stephen Bovy, 2012 Apr 28)
 Updates later. Context diff May 7.
 
+Patch to support browserfilter for GTK. (Christian Brabandt, 2012 May 22)
+
 When running Vim in silent ex mode, an existing swapfile causes Vim to wait
 for a user action without a prompt. (Maarten Billemont, 2012 Feb 3)
 Do give the prompt? Quit with an error?
@@ -112,9 +116,6 @@ Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
 
 Patch for input method status. (Hirohito Higashi, 2012 Apr 18)
 
-Use a count before "v" and "V" to select that many characters or lines?
-(Kikyous)
-
 Problem with winfixheight and resizing. (Yukihiro Nakadaira, 2011 Sep 17)
 Patch Sep 18.
 
@@ -140,6 +141,8 @@ Patch to pass list to or(), and() and xor(). (Yasuhiro Matsumoto, 2012 Feb 8)
 Patch to improve "it" and "at" text object matching. (Christian Brabandt, 2011
 Nov 20)
 
+Patch to improve GUI find/replace dialog. (Christian Brabandt, 2012 May 26)
+
 Patch to add ":py3do". (Lilydjwg, 2012 Apr 7)
 
 `[ moves to character after insert, instead of the last inserted character.
@@ -147,6 +150,9 @@ Patch to add ":py3do". (Lilydjwg, 2012 Apr 7)
 
 Plugin for Modeleasy. (Massimiliano Tripoli, 2011 Nov 29)
 
+When using remote-silent the -R flag is not passed on. (Axel Bender, 2012 May
+31)
+
 Updated syntax file for ssh_config, maintainer doesn't respond.
 (Leonard Ehrenfried, 2011 Sep 26)
 
@@ -161,6 +167,8 @@ Patch to support cursor shape in Cygwin console. (Ben bgold, 2011 Dec 27)
 Patch to support UTF-8 for Hangul. (Shawn Y.H. Kim, 2011 May 1)
 Needs more work.  Pinged 2012 Jan 4.
 
+Issue 64: when 'incsearch' is on can't paste LF on command line.
+
 'cursorline' is displayed too short when there are concealed characters and
 'list' is set.  (Dennis Preiser)
 Patch 7.3.116 was the wrong solution.
@@ -3942,7 +3950,6 @@ Insert mode:
 -   Add option to 'cindent' to set indent for comments outside of {}?
 -   Make a command to line up a comment after a code line with a previous
     comment after a code line.	Can 'cindent' do this automatically?
-7   Add 'j' flag to 'formatoptions': Remove comment leader when joining lines.
 -   When 'cindent'ing a '}', showmatch is done before fixing the indent.  It
     looks better when the indent is fixed before the showmatch. (Webb)
 -   Add option to make indenting work in comments too (for commented-out
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index 3f23f1dc12..82481dc27b 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.3.  Last change: 2010 Aug 07
+*uganda.txt*    For Vim version 7.3.  Last change: 2012 May 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -266,7 +266,7 @@ Credit Card:	You can use PayPal to send money with a Credit card.  This is
 Others:		Transfer to one of these accounts if possible:
 		    Postbank, account 4548774
 				Swift code: INGB NL 2A
-				IBAN: NL47 PSTB 0004 5487 74
+				IBAN: NL95 INGB 0004 5487 74
 			under the name "stichting ICCF Holland", Lisse
 		    If that doesn't work:
 		    Rabobank Lisse, account 3765.05.117
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
index 17a29e4bdb..28b98a898d 100644
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -2452,7 +2452,7 @@ differently.
 
 ":n *.c" ":cd .." ":n" didn't use the original directory of the file.  Vi only
 does it for the current file (looks like a bug).  Now remember the buffer used
-for the entry in the argument list and use it's name (adjusted when doing
+for the entry in the argument list and use its name (adjusted when doing
 ":cd"), unless it's deleted.
 
 When inserting a special key as its name ("<F8>" as four characters) after
@@ -3675,7 +3675,7 @@ When double clicking on the first character of a word while 'selection' is
 
 
 Patch 6.0.001
-Problem:    Loading the sh.vim syntax file causes error messages . (Corinna
+Problem:    Loading the sh.vim syntax file causes error messages. (Corinna
 	    Vinschen)
 Solution:   Add an "if". (Charles Campbell)
 Files:	    runtime/syntax/sh.vim
@@ -9091,7 +9091,7 @@ Files:	    src/Make_w16.mak, src/testdir/Make_dos.mak
 Patch 6.1.402
 Problem:    When evaluating a function name with curly braces, an error
 	    is not handled consistently.
-Solution:   Accept the result of an curly braces expression when an
+Solution:   Accept the result of a curly braces expression when an
 	    error was encountered.  Skip evaluating an expression in curly
 	    braces when skipping.  (Servatius Brandt)
 Files:	    src/eval.c
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 761e24185c..d724f651d1 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -9072,7 +9072,7 @@ Patch 7.2.280
 Problem:    A redraw in a custom statusline with %! may cause a crash.
 	    (Yukihiro Nakadaira)
 Solution:   Make a copy of 'statusline'.  Also fix typo in function name
-	    redraw_custum_statusline. (partly by Dominique Pelle)
+	    redraw_custom_statusline. (partly by Dominique Pelle)
 Files:	    src/screen.c
 
 Patch 7.2.281
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 8c50a2900e..f573845213 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 7.3.  Last change: 2010 Feb 17
+*visual.txt*    For Vim version 7.3.  Last change: 2012 May 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -61,15 +61,20 @@ position.
 2. Starting and stopping Visual mode			*visual-start*
 
 						*v* *characterwise-visual*
-v			start Visual mode per character.
+[count]v		Start Visual mode per character.
+			With [count] select that many characters, like moving
+			the cursor right [count] characters.  One less when
+			'selection' is not "exclusive".
 
 						*V* *linewise-visual*
-V			start Visual mode linewise.
+[count]V		Start Visual mode linewise.
+			With [count] select that many lines.
 
 						*CTRL-V* *blockwise-visual*
-CTRL-V			start Visual mode blockwise.  Note: Under Windows
+[count]CTRL-V		Start Visual mode blockwise.  Note: Under Windows
 			CTRL-V could be mapped to paste text, it doesn't work
 			to start Visual mode then, see |CTRL-V-alternative|.
+			[count] is used as with `v` above.
 
 If you use <Esc>, click the left mouse button or use any command that
 does a jump to another buffer while in Visual mode, the highlighting stops
diff --git a/runtime/indent/css.vim b/runtime/indent/css.vim
index f85bb05acb..f0a272eff9 100644
--- a/runtime/indent/css.vim
+++ b/runtime/indent/css.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	    CSS
 " Maintainer:	    Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2010-12-22
+" Latest Revision:  2012-05-30
 
 if exists("b:did_indent")
   finish
@@ -12,6 +12,8 @@ setlocal indentexpr=GetCSSIndent()
 setlocal indentkeys=0{,0},!^F,o,O
 setlocal nosmartindent
 
+let b:undo_indent = "setl smartindent< indentkeys< indentexpr<"
+
 if exists("*GetCSSIndent")
   finish
 endif
diff --git a/runtime/indent/eiffel.vim b/runtime/indent/eiffel.vim
index 472665275b..87e82e833d 100644
--- a/runtime/indent/eiffel.vim
+++ b/runtime/indent/eiffel.vim
@@ -1,11 +1,11 @@
 " Vim indent file
 " Language:	Eiffel
-" Maintainer:	Jocelyn Fiat <eiffel@djoce.net>
+" Maintainer:	Jocelyn Fiat <jfiat@eiffel.com>
 " Previous-Maintainer:	David Clarke <gadicath@dishevelled.net>
+" Contributions from: Thilo Six
 " $Date: 2004/12/09 21:33:52 $
 " $Revision: 1.3 $
-" URL: http://www.djoce.net/page/vim/
-" Last Change:	2012 May 18
+" URL: https://github.com/eiffelhub/vim-eiffel
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -23,6 +23,8 @@ setlocal indentkeys+==end,=else,=ensure,=require,=check,=loop,=until
 setlocal indentkeys+==creation,=feature,=inherit,=class,=is,=redefine,=rename,=variant
 setlocal indentkeys+==invariant,=do,=local,=export
 
+let b:undo_indent = "setl smartindent< indentkeys< indentexpr< autoindent< comments< "
+
 " Define some stuff
 " keywords grouped by indenting
 let s:trust_user_indent = '\(+\)\(\s*\(--\).*\)\=$'
@@ -37,6 +39,7 @@ let s:inheritance_dent = '\s*\(redefine\|rename\|export\)\>'
 if exists("*GetEiffelIndent")
   finish
 endif
+
 let s:keepcpo= &cpo
 set cpo&vim
 
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 8281d94c09..a17bae1674 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 May 18
+" Last Change:	2012 May 20
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -12,6 +12,8 @@ let b:did_indent = 1
 setlocal indentexpr=GetVimIndent()
 setlocal indentkeys+==end,=else,=cat,=fina,=END,0\\
 
+let b:undo_indent = "setl indentkeys< indentexpr<"
+
 " Only define the function once.
 if exists("*GetVimIndent")
   finish
@@ -54,7 +56,7 @@ function GetVimIndent()
     if i >= 0
       let ind += &sw
       if strpart(line, i, 1) == '|' && has('syntax_items')
-            \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$' 
+            \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
         let ind -= &sw
       endif
     endif
diff --git a/runtime/syntax/bc.vim b/runtime/syntax/bc.vim
index dcfaf486a5..965afc35b1 100644
--- a/runtime/syntax/bc.vim
+++ b/runtime/syntax/bc.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	bc - An arbitrary precision calculator language
 " Maintainer:	Vladimir Scholtz <vlado@gjh.sk>
-" Last change:	2001 Sep 02
+" Last change:	2012 Jun 01
+" 		(Dominique Pelle added @Spell)
 " Available on:	www.gjh.sk/~vlado/bc.vim
 
 " For version 5.x: Clear all syntax items
@@ -31,14 +32,14 @@ syn keyword bcConstant BC_ENV_ARGS BC_LINE_LENGTH
 syn match bcIdentifier		"[a-z_][a-z0-9_]*"
 
 " String
- syn match bcString		"\"[^"]*\""
+ syn match bcString		"\"[^"]*\"" contains=@Spell
 
 " Number
 syn match bcNumber		"[0-9]\+"
 
 " Comment
-syn match bcComment		"\#.*"
-syn region bcComment		start="/\*" end="\*/"
+syn match bcComment		"\#.*" contains=@Spell
+syn region bcComment		start="/\*" end="\*/" contains=@Spell
 
 " Parent ()
 syn cluster bcAll contains=bcList,bcIdentifier,bcNumber,bcKeyword,bcType,bcConstant,bcString,bcParentError
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
index e241605e0b..8e54d511e0 100644
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -4,7 +4,8 @@
 " Language:     CMake
 " Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
 " Maintainer:   Karthik Krishnan <karthik.krishnan@kitware.com>
-" Last Change:  $Date: 2008-08-25 14:31:28 $
+" Last Change:  2012 Jun 01
+" 		(Dominique Pelle added @Spell)
 " Version:      $Revision: 1.10 $
 "
 " Licence:      The CMake license applies to this file. See
@@ -23,7 +24,7 @@ set cpo&vim
 
 syn case ignore
 syn match cmakeEscaped /\(\\\\\|\\"\|\\n\|\\t\)/ contained
-syn region cmakeComment start="#" end="$" contains=cmakeTodo
+syn region cmakeComment start="#" end="$" contains=@Spell,cmakeTodo
 syn region cmakeRegistry start=/\[/ end=/]/
             \ contained oneline contains=CONTAINED,cmakeTodo,cmakeEscaped
 syn region cmakeVariableValue start=/\${/ end=/}/
diff --git a/runtime/syntax/dirpager.vim b/runtime/syntax/dirpager.vim
index 371dda3674..1a60063798 100644
--- a/runtime/syntax/dirpager.vim
+++ b/runtime/syntax/dirpager.vim
@@ -1,11 +1,20 @@
 " Vim syntax file
-" Language:	  directory pager
-" Maintainer:	  Thilo Six <T.Six@gmx.de>
-" Derived From:	  Nikolai Weibulls dircolors.vim
-" Last Change:	  2011 Dec 11
+" Maintainer:	  Thilo Six
+" Contact:	  <vim-dev at vim dot org>
+"		  http://www.vim.org/maillist.php#vim-dev
+"
+" Description:	  display directory content inside Vim with syntax
+"		  highlighting
+" File:		  runtime/syntax/dirpager.vim
+" Last Change:	  2012 May 19
 " Modeline:	  vim: ts=8:sw=2:sts=2:
 "
-" usage: $ ls -la | view -c "set ft=dirpager" -
+" Credits:	  dirpager.vim is derived from Nikolai Weibulls dircolors.vim
+"
+" License:	  VIM License
+"		  Vim is Charityware, see ":help Uganda"
+"
+" Usage:	  $ ls -la | view -c "set ft=dirpager" -
 "
 "
 ",----[ ls(1posix) ]--------------------------------------------------
@@ -19,7 +28,6 @@
 "       l (ell)	Symbolic link.
 "       p	FIFO.
 "       -	Regular file.
-"`--------------------------------------------------------------------
 "
 
 if exists("b:current_syntax") || &compatible
diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim
index dcc1a3c10e..ebee808a57 100644
--- a/runtime/syntax/dnsmasq.vim
+++ b/runtime/syntax/dnsmasq.vim
@@ -1,18 +1,21 @@
-" Vim file
-" Maintainer:	Thilo Six <T.Six@gmx.de>
-" Version:	2.60-1
-" Last Change:	2012 Mar 10
-" Modeline:	vim: ts=8:sw=2:sts=2:
+" Vim syntax file
+" Maintainer:	Thilo Six
+" Contact:	<vim-dev at vim dot org>
+"		http://www.vim.org/maillist.php#vim-dev
+"
+" Description:	highlight dnsmasq configuration files
 " File:		runtime/syntax/dnsmasq.vim
+" Version:	2.61-1
+" Last Change:	2012 May 19
+" Modeline:	vim: ts=8:sw=2:sts=2:
 "
 " Credits:	Igor N. Prischepoff
 "		Doug Kearns
 "		David Ne\v{c}as
+"		Christian Brabandt
 "
 " License:	VIM License
-"		see ":help copyright"
-"
-" Description:	highlight dnsmasq configuration files
+"		Vim is Charityware, see ":help Uganda"
 "
 " Options:	You might want to add this to your vimrc:
 "
@@ -51,23 +54,21 @@ syn match   DnsmasqValues   "=.*"hs=s+1 contains=DnsmasqComment,DnsmasqSpecial
 syn match   DnsmasqSpecial  display '=\|@\|,\|!\|:'	  nextgroup=DnsmasqValues
 syn match   DnsmasqSpecial  "#"
 
-syn match   DnsmasqIPv4	    "\(\d\{1,3}\.\)\{3}\d\{1,3}"  nextgroup=DnsmasqSubnet2,DnsmasqRange
-syn match   DnsmasqSubnet   "\<255.\(\d\{1,3}\.\)\{2}\d\{1,3}"
-syn match   DnsmasqSubnet2  contained "\/\(\d\{1,2}\)\>"
+syn match   DnsmasqIPv4	    "\<\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{3\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\>"	nextgroup=DnsmasqSubnet2,DnsmasqRange
+syn match   DnsmasqSubnet   "\<255.\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{2\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\>"
+syn match   DnsmasqSubnet2  contained "\/\([0-4]\?[0-9]\)\>"
 syn match   DnsmasqRange    contained "-"
 syn match   DnsmasqMac	    "\<\(\x\x\?:\)\{5}\x\x\?"
 
 syn match   DnsmasqTime	    "\<\(\d\{1,3}\)[hm]\>"
 
 " String
-syn match   DnsmasqString   "\".*\""
-syn match   DnsmasqString   "'.*'"
+syn match   DnsmasqString   "\".*\""  contains=@Spell
+syn match   DnsmasqString   "'.*'"    contains=@Spell
 
 " Comments
-syn match   DnsmasqComment  "^#.*$"   contains=DnsmasqTodo
-syn match   DnsmasqComment  "\s#.*$"  contains=DnsmasqTodo
-
 syn keyword DnsmasqTodo	    FIXME TODO XXX NOTE contained
+syn match   DnsmasqComment  "\(^\|\s\+\)#.*$"   contains=@Spell,DnsmasqTodo
 
 " highlight trailing spaces
 syn match   DnsmasqTrailSpace	   "[ \t]\+$"
@@ -109,6 +110,7 @@ syn match DnsmasqKeyword    "^\s*dhcp-boot\>"
 syn match DnsmasqKeyword    "^\s*dhcp-broadcast\>"
 syn match DnsmasqKeyword    "^\s*dhcp-circuitid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-client-update\>"
+syn match DnsmasqKeyword    "^\s*dhcp-duid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-fqdn\>"
 syn match DnsmasqKeyword    "^\s*dhcp-generate-names\>"
 syn match DnsmasqKeyword    "^\s*dhcp-host\>"
@@ -144,6 +146,7 @@ syn match DnsmasqKeyword    "^\s*except-interface\>"
 syn match DnsmasqKeyword    "^\s*expand-hosts\>"
 syn match DnsmasqKeyword    "^\s*filterwin2k\>"
 syn match DnsmasqKeyword    "^\s*group\>"
+syn match DnsmasqKeyword    "^\s*host-record\>"
 syn match DnsmasqKeyword    "^\s*interface\>"
 syn match DnsmasqKeyword    "^\s*interface-name\>"
 syn match DnsmasqKeyword    "^\s*keep-in-foreground\>"
@@ -189,6 +192,7 @@ syn match DnsmasqKeyword    "^\s*strict-order\>"
 syn match DnsmasqKeyword    "^\s*tag-if\>"
 syn match DnsmasqKeyword    "^\s*test\>"
 syn match DnsmasqKeyword    "^\s*tftp-max\>"
+syn match DnsmasqKeyword    "^\s*tftp-lowercase\>"
 syn match DnsmasqKeyword    "^\s*tftp-no-blocksize\>"
 syn match DnsmasqKeyword    "^\s*tftp-port-range\>"
 syn match DnsmasqKeyword    "^\s*tftp-root\>"
@@ -200,11 +204,9 @@ syn match DnsmasqKeyword    "^\s*version\>"
 
 
 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 DnsmasqKeywordSpecial Type
 hi def link DnsmasqTodo		Todo
diff --git a/runtime/syntax/eiffel.vim b/runtime/syntax/eiffel.vim
index e5bc69ada7..a91f85d03e 100644
--- a/runtime/syntax/eiffel.vim
+++ b/runtime/syntax/eiffel.vim
@@ -1,10 +1,10 @@
 " Eiffel syntax file
 " Language:	Eiffel
-" Maintainer:	Reimer Behrends <behrends@cse.msu.edu>
-"		With much input from Jocelyn Fiat <fiat@eiffel.com>
-" See http://www.cse.msu.edu/~behrends/vim/ for the most current version.
-" Last Change:	2011 Dec 31 by Thilo Six
-
+" Maintainer: Jocelyn Fiat <jfiat@eiffel.com>
+" Previous maintainer:	Reimer Behrends <behrends@cse.msu.edu>
+" Contributions from: Thilo Six
+" 
+" URL: https://github.com/eiffelhub/vim-eiffel
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
@@ -13,7 +13,7 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-let s:cpo_save = &cpo
+let s:keepcpo= &cpo
 set cpo&vim
 
 " Option handling
@@ -43,7 +43,7 @@ endif
 
 " Keyword definitions
 
-syn keyword eiffelTopStruct	indexing feature creation inherit
+syn keyword eiffelTopStruct	note indexing feature creation inherit
 syn match   eiffelTopStruct	"\<class\>"
 syn match   eiffelKeyword	"\<end\>"
 syn match   eiffelTopStruct	"^end\>\(\s*--\s\+class\s\+\<[A-Z][A-Z0-9_]*\>\)\=" contains=eiffelClassName
@@ -51,27 +51,30 @@ syn match   eiffelBrackets	"[[\]]"
 syn match eiffelBracketError	"\]"
 syn region eiffelGeneric	transparent matchgroup=eiffelBrackets start="\[" end="\]" contains=ALLBUT,eiffelBracketError,eiffelGenericDecl,eiffelStringError,eiffelStringEscape,eiffelGenericCreate,eiffelTopStruct
 if exists("eiffel_ise")
+  syn match   eiffelAgent	"\<agent\>"
+  syn match   eiffelConvert	"\<convert\>"
   syn match   eiffelCreate	"\<create\>"
   syn match   eiffelTopStruct	contained "\<create\>"
+  syn match   eiffelTopStruct	contained "\<convert\>"
   syn match   eiffelGenericCreate  contained "\<create\>"
   syn match   eiffelTopStruct	"^create\>"
   syn region  eiffelGenericDecl	transparent matchgroup=eiffelBrackets contained start="\[" end="\]" contains=ALLBUT,eiffelCreate,eiffelTopStruct,eiffelGeneric,eiffelBracketError,eiffelStringEscape,eiffelStringError,eiffelBrackets
   syn region  eiffelClassHeader	start="^class\>" end="$" contains=ALLBUT,eiffelCreate,eiffelGenericCreate,eiffelGeneric,eiffelStringEscape,eiffelStringError,eiffelBrackets
 endif
-syn keyword eiffelDeclaration	is do once deferred unique local
-syn keyword eiffelDeclaration	Unique
+syn keyword eiffelDeclaration	is do once deferred unique local attribute assign
+syn keyword eiffelDeclaration	attached detachable Unique
 syn keyword eiffelProperty	expanded obsolete separate frozen
 syn keyword eiffelProperty	prefix infix
 syn keyword eiffelInheritClause	rename redefine undefine select export as
 syn keyword eiffelAll		all
-syn keyword eiffelKeyword	external alias
+syn keyword eiffelKeyword	external alias some
 syn keyword eiffelStatement	if else elseif inspect
 syn keyword eiffelStatement	when then
 syn match   eiffelAssertion	"\<require\(\s\+else\)\=\>"
 syn match   eiffelAssertion	"\<ensure\(\s\+then\)\=\>"
 syn keyword eiffelAssertion	check
 syn keyword eiffelDebug		debug
-syn keyword eiffelStatement	from until loop
+syn keyword eiffelStatement	across from until loop
 syn keyword eiffelAssertion	variant
 syn match   eiffelAssertion	"\<invariant\>"
 syn match   eiffelTopStruct	"^invariant\>"
@@ -129,6 +132,11 @@ syn match   eiffelClassName	"\<[A-Z][A-Z0-9_]*\>"
 syn match eiffelParenError	")"
 syn region eiffelParen		transparent start="(" end=")" contains=ALLBUT,eiffelParenError,eiffelStringError,eiffelStringEscape
 
+if exists("eiffel_fold")
+"    setlocal foldmethod=indent
+"    syn sync fromstart
+endif
+
 " Should suffice for even very long strings and expressions
 syn sync lines=40
 
@@ -153,6 +161,8 @@ if version >= 508 || !exists("did_eiffel_syntax_inits")
   HiLink eiffelException	Statement
   HiLink eiffelGenericCreate	Statement
 
+  HiLink eiffelAgent		Statement
+  HiLink eiffelConvert		Statement
 
   HiLink eiffelTopStruct	PreProc
 
@@ -196,6 +206,7 @@ endif
 
 let b:current_syntax = "eiffel"
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
 " vim: ts=8
diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim
index 1886e2b3e3..6ff7d4142c 100644
--- a/runtime/syntax/expect.vim
+++ b/runtime/syntax/expect.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Expect
 " Maintainer:	Ralph Jennings <knowbudy@oro.net>
-" Last Change:	2001 May 09
+" Last Change:	2012 Jun 01
+" 		(Dominique Pelle added @Spell)
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -72,11 +73,12 @@ syn case ignore
   "syn match  expectIdentifier	"\<[a-z_][a-z0-9_]*\>"
 syn case match
 
-syn region  expectString	start=+"+  end=+"+  contains=expectVariables,expectSpecial
+syn region  expectString	start=+"+  end=+"+  contains=@Spell,expectVariables,expectSpecial
 
 " Are these really comments in Expect? (I never use it, so I'm just guessing).
 syn keyword expectTodo		contained TODO
-syn match   expectComment		"#.*$" contains=expectTodo
+syn match   expectComment	"#.*$" contains=@Spell,expectTodo
+syn match   expectSharpBang	"\%^#!.*"
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -89,6 +91,7 @@ if version >= 508 || !exists("did_expect_syntax_inits")
     command -nargs=+ HiLink hi def link <args>
   endif
 
+  HiLink expectSharpBang	PreProc
   HiLink expectVariables	Special
   HiLink expectCommand		Function
   HiLink expectStatement	Statement
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index b42c5dcd65..99e9400b95 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -1,13 +1,13 @@
 " Vim syntax file
 " Language:    FORTH
 " Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
-" Last Change: Sa 07 Jan 2012 21:30:55 CET
+" Last Change: So 27 Mai 2012 15:56:28 CEST
 " Filenames:   *.fs,*.ft
 " URL:	       http://www.cvjb.de/comp/vim/forth.vim
 
-" $Id: forth.vim,v 1.13 2012/01/07 21:31:31 bruessow Exp $
+" $Id: forth.vim,v 1.14 2012/05/27 15:57:22 bruessow Exp $
 
-" The list of keywords is incomplete, compared with the offical ANS
+" The list of keywords is incomplete, compared with the official ANS
 " wordlist. If you use this language, please improve it, and send me
 " the patches.
 "
@@ -16,6 +16,10 @@
 " for forth.vim).
 
 " Many Thanks to...
+"
+" 2012-05-13:
+" Dominique Pellé <dominique dot pelle at gmail dot com> for sending the
+" patch to allow spellchecking of strings, comments, ...
 " 
 " 2012-01-07:
 " Thilo Six <T.Six at gmx dot de> send a patch for cpoptions.
@@ -44,7 +48,7 @@
 " Bill McCarthy <WJMc@...> and Ilya Sher <ilya-vim@...>
 " Who found a bug in the ccomment line in 2004!!!
 " I'm really very sorry, that it has taken two years to fix that
-" in the offical version of this file. Shame on me.
+" in the official version of this file. Shame on me.
 " I think my face will be red the next ten years...
 "
 " 2006-05-21:
@@ -256,22 +260,22 @@ syn match forthInteger '\<%[0-1]*[0-1]\+\>'
 syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe]\d\+\>'
 syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe][-+]\d\+\>'
 
-" XXX If you find this overkill you can remove it. this has to come after the
+" XXX If you find this overkill you can remove it. This has to come after the
 " highlighting for numbers otherwise it has no effect.
 syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo
 
 " Strings
-syn region forthString start=+\.*\"+ end=+"+ end=+$+
+syn region forthString start=+\.*\"+ end=+"+ end=+$+ contains=@Spell
 " XXX
-syn region forthString start=+s\"+ end=+"+ end=+$+
-syn region forthString start=+c\"+ end=+"+ end=+$+
+syn region forthString start=+s\"+ end=+"+ end=+$+ contains=@Spell
+syn region forthString start=+c\"+ end=+"+ end=+$+ contains=@Spell
 
 " Comments
-syn match forthComment '\\\s.*$' contains=forthTodo,forthSpaceError
-syn region forthComment start='\\S\s' end='.*' contains=forthTodo,forthSpaceError
-syn match forthComment '\.(\s[^)]*)' contains=forthTodo,forthSpaceError
-syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=forthTodo,forthSpaceError
-syn region forthComment start='/\*' end='\*/' contains=forthTodo,forthSpaceError
+syn match fo