vim-patch:f2571c6

Update runtime files.

References #3625.

19 files changed, 332 insertions, 79 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 44a08909db..5ed2ca6016 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2962,6 +2962,8 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		{expr1} is changed when {expr2} is not empty.  If necessary
 		make a copy of {expr1} first.
 		{expr2} remains unchanged.
+		When {expr1} is locked and {expr2} is not empty the operation
+		fails.
 		Returns {expr1}.
 
 
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index a48ad0185d..013eb6b97b 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.4.  Last change: 2014 Aug 04
+*insert.txt*    For Vim version 7.4.  Last change: 2015 May 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -77,9 +77,11 @@ CTRL-W		Delete the word before the cursor (see |i_backspacing| about
 		joining lines).  See the section "word motions",
 		|word-motions|, for the definition of a word.
 						*i_CTRL-U*
-CTRL-U		Delete all entered characters in the current line (see
-		|i_backspacing| about joining lines).
-
+CTRL-U		Delete all entered characters before the cursor in the current
+		line.  If there are no newly entereed characters and
+		'backspace'is not empty, delete all characters before the
+		cursor in the current line.
+		See |i_backspacing| about joining lines.
 						*i_CTRL-I* *i_<Tab>* *i_Tab*
 <Tab> or CTRL-I Insert a tab.  If the 'expandtab' option is on, the
 		equivalent number of spaces is inserted (use CTRL-V <Tab> to
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 5e3fe715ab..7f84f2d2a3 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.4.  Last change: 2014 Feb 11
+*motion.txt*    For Vim version 7.4.  Last change: 2015 Jun 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -171,6 +171,8 @@ CTRL-H		or					*CTRL-H* *<BS>*
 l		or					*l*
 <Right>		or					*<Right>* *<Space>*
 <Space>			[count] characters to the right.  |exclusive| motion.
+			See the 'whichwrap' option for adjusting the behavior
+			at end of line
 
 							*0*
 0			To the first character of the line.  |exclusive|
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9e0e39e3f8..b06e702637 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -495,7 +495,7 @@ au BufNewFile,BufRead *.prg
 	\ endif
 
 " Clojure
-au BufNewFile,BufRead *.clj,*.cljs		setf clojure
+au BufNewFile,BufRead *.clj,*.cljs,*.cljx,*.cljc		setf clojure
 
 " Cmake
 au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in		setf cmake
@@ -772,10 +772,9 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
 " Git
-au BufNewFile,BufRead *.git/COMMIT_EDITMSG	setf gitcommit
-au BufNewFile,BufRead *.git/MERGE_MSG		setf gitcommit
+au BufNewFile,BufRead COMMIT_EDITMSG		setf gitcommit
+au BufNewFile,BufRead MERGE_MSG			setf gitcommit
 au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
-au BufNewFile,BufRead *.git/modules/*/COMMIT_EDITMSG setf gitcommit
 au BufNewFile,BufRead *.git/modules/*/config	setf gitconfig
 au BufNewFile,BufRead */.config/git/config	setf gitconfig
 if !empty($XDG_CONFIG_HOME)
diff --git a/runtime/ftplugin/kconfig.vim b/runtime/ftplugin/kconfig.vim
index 1b10c86ae3..940ba7427f 100644
--- a/runtime/ftplugin/kconfig.vim
+++ b/runtime/ftplugin/kconfig.vim
@@ -1,6 +1,10 @@
 " Vim filetype plugin file
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2008-07-09
+" Vim syntax file
+" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-05-29
+" License:              Vim (see :h license)
+" Repository:		https://github.com/chrisbra/vim-kconfig
 
 if exists("b:did_ftplugin")
   finish
@@ -14,5 +18,10 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
+" For matchit.vim
+if exists("loaded_matchit")
+  let b:match_words = '^\<menu\>:\<endmenu\>,^\<if\>:\<endif\>,^\<choice\>:\<endchoice\>'
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
index c3af8a9fca..0b6750de94 100644
--- a/runtime/ftplugin/spec.vim
+++ b/runtime/ftplugin/spec.vim
@@ -20,11 +20,36 @@ endif
 
 noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR>
 
+if !exists("*s:GetRelVer")
+	function! s:GetRelVer()
+		if has('python')
+python << PYEND
+import sys, datetime, shutil, tempfile
+import vim
+
+try:
+    import rpm
+except ImportError:
+    pass
+else:
+    specfile = vim.current.buffer.name
+    if specfile:
+        spec = rpm.spec(specfile)
+        headers = spec.packages[0].header
+        version = headers['Version']
+        release = ".".join(headers['Release'].split(".")[:-1])
+        vim.command("let ver = " + version)
+        vim.command("let rel = " + release)
+PYEND
+		endif
+	endfunction
+endif
+
 if !exists("*s:SpecChangelog")
 	function s:SpecChangelog(format)
 		if strlen(a:format) == 0
 			if !exists("g:spec_chglog_format")
-				let email = input("Email address: ")
+				let email = input("Name <email address>: ")
 				let g:spec_chglog_format = "%a %b %d %Y " . l:email
 				echo "\r"
 			endif
@@ -69,6 +94,9 @@ if !exists("*s:SpecChangelog")
 		else
 			let include_release_info = 0
 		endif
+
+		call s:GetRelVer()
+
 		if (chgline == -1)
 			let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3)
 			if (option == 1)
@@ -83,7 +111,7 @@ if !exists("*s:SpecChangelog")
 			endif
 		endif
 		if (chgline != -1)
-			let parsed_format = "* ".strftime(format)
+			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
 			let release_info = "+ ".name."-".ver."-".rel
 			let wrong_format = 0
 			let wrong_release = 0
diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim
index 3970d65cc8..6cbc380dc3 100644
--- a/runtime/ftplugin/zsh.vim
+++ b/runtime/ftplugin/zsh.vim
@@ -1,7 +1,10 @@
 " Vim filetype plugin file
-" Language:         Zsh shell script
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2011-01-23
+" Language:		Zsh shell script
+" Maintainer:		Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:	2015-05-29
+" License:		Vim (see :h license)
+" Repository:		https://github.com/chrisbra/vim-zsh
 
 if exists("b:did_ftplugin")
   finish
diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim
index a83d34b110..21c8fff86c 100644
--- a/runtime/indent/javascript.vim
+++ b/runtime/indent/javascript.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Javascript
-" Maintainer:	None!  Wanna improve this?
-" Last Change:	2007 Jan 22
+" Maintainer:	Going to be Darrick Wiebe
+" Last Change:	2015 Jun 09
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -12,5 +12,7 @@ let b:did_indent = 1
 " C indenting is not too bad.
 setlocal cindent
 setlocal cinoptions+=j1,J1
+setlocal cinkeys-=0#
+setlocal cinkeys+=0]
 
 let b:undo_indent = "setl cin<"
diff --git a/runtime/indent/zsh.vim b/runtime/indent/zsh.vim
index c5580a10b1..8e30c65c18 100644
--- a/runtime/indent/zsh.vim
+++ b/runtime/indent/zsh.vim
@@ -1,7 +1,10 @@
 " Vim indent file
-" Language:	    Zsh Shell Script
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" Language:             Zsh shell script
+" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-05-29
+" License:              Vim (see :h license)
+" Repository:           https://github.com/chrisbra/vim-zsh
 
 if exists("b:did_indent")
   finish
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index 04fc73342c..15f0cbb4ff 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -63,7 +63,7 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppStructure		Structure
   HiLink cppBoolean		Boolean
   HiLink cppConstant		Constant
-  HiLink cppRawDelimiter	Delimiter
+  HiLink cppRawStringDelimiter	Delimiter
   HiLink cppRawString		String
   delcommand HiLink
 endif
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index 6206fa388c..ed3d024499 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2014 Jul 11
+" Last Change: 2015 Apr 30
 " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -16,10 +16,14 @@ endif
 " Case doesn't matter for us
 syn case ignore
 
+let urgency='urgency=\(low\|medium\|high\|critical\)\( [^[:space:],][^,]*\)\='
+let binNMU='binary-only=yes'
+
 " Define some common expressions we can use later on
 syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
-syn match debchangelogUrgency	contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
-syn match debchangelogTarget	contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|%(devel|lucid|precise|trusty|utopic)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+exe 'syn match debchangelogFirstKV	contained "; \('.urgency.'\|'.binNMU.'\)"'
+exe 'syn match debchangelogOtherKV	contained ", \('.urgency.'\|'.binNMU.'\)"'
+syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|lucid|precise|trusty|utopic)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
 syn match debchangelogVersion	contained "(.\{-})"
 syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
 syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
@@ -27,7 +31,7 @@ syn match debchangelogEmail	contained "[_=[:alnum:].+-]\+@[[:alnum:]./\-]\+"
 syn match debchangelogEmail	contained "<.\{-}>"
 
 " Define the entries that make up the changelog
-syn region debchangelogHeader start="^[^ ]" end="$" contains=debchangelogName,debchangelogUrgency,debchangelogTarget,debchangelogVersion oneline
+syn region debchangelogHeader start="^[^ ]" end="$" contains=debchangelogName,debchangelogFirstKV,debchangelogOtherKV,debchangelogTarget,debchangelogVersion,debchangelogBinNMU oneline
 syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail oneline
 syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
@@ -45,7 +49,8 @@ if version >= 508 || !exists("did_debchangelog_syn_inits")
   HiLink debchangelogEntry		Normal
   HiLink debchangelogCloses		Statement
   HiLink debchangelogLP			Statement
-  HiLink debchangelogUrgency		Identifier
+  HiLink debchangelogFirstKV		Identifier
+  HiLink debchangelogOtherKV		Identifier
   HiLink debchangelogName		Comment
   HiLink debchangelogVersion		Identifier
   HiLink debchangelogTarget		Identifier
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 5d9d45d025..6d140d9bd9 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2014 May 01
+" Last Change: 2014 Oct 08
 " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -50,7 +50,7 @@ syn match debcontrolDmUpload contained "\cyes"
 syn match debcontrolHTTPUrl contained "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
 syn match debcontrolVcsSvn contained "\vsvn%(\+ssh)?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
 syn match debcontrolVcsCvs contained "\v%(\-d *)?:pserver:[^@]+\@[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?:/[^[:space:]]*%( [^[:space:]]+)?$"
-syn match debcontrolVcsGit contained "\v%(git|http)://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?%(\s+-b\s+[^ ~^:?*[\\]+)?$"
+syn match debcontrolVcsGit contained "\v%(git|https?)://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?%(\s+-b\s+[^ ~^:?*[\\]+)?$"
 
 " An email address
 syn match	debcontrolEmail	"[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index e877b06ae4..c8d110c77b 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2014 Jul 11
+" Last Change: 2015 May 25
 " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -21,15 +21,35 @@ syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|res
 " Match comments
 syn match debsourcesComment        /#.*/  contains=@Spell
 
+let s:cpo = &cpo
+set cpo-=C
+let s:supported = [
+      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+      \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
+      \
+      \ 'precise', 'trusty', 'utopic', 'vivid', 'wily', 'devel'
+      \ ]
+let s:unsupported = [
+      \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+      \ 'woody', 'sarge', 'etch', 'lenny',
+      \
+      \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+      \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+      \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy'
+      \ ]
+let &cpo=s:cpo
+
 " Match uri's
 syn match debsourcesUri            +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
-syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(squeeze\|wheezy\|jessie\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|devel\|lucid\|precise\|trusty\|utopic\)\([-[:alnum:]_./]*\)+
+exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\('. join(s:supported, '\|'). '\)\([-[:alnum:]_./]*\)+'
+exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\('. join(s:unsupported, '\|') .'\)\([-[:alnum:]_./]*\)+'
 
 " Associate our matches and regions with pretty colours
-hi def link debsourcesLine            Error
-hi def link debsourcesKeyword         Statement
-hi def link debsourcesDistrKeyword    Type
-hi def link debsourcesComment         Comment
-hi def link debsourcesUri             Constant
+hi def link debsourcesLine                    Error
+hi def link debsourcesKeyword                 Statement
+hi def link debsourcesDistrKeyword            Type
+hi def link debsourcesUnsupportedDistrKeyword WarningMsg
+hi def link debsourcesComment                 Comment
+hi def link debsourcesUri                     Constant
 
 let b:current_syntax = "debsources"
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 2056bd16d0..c745960bd5 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -157,7 +157,7 @@ syn match groovyOperator "\.\."
 syn match groovyOperator "<\{2,3}"
 syn match groovyOperator ">\{2,3}"
 syn match groovyOperator "->"
-syn match groovyExternal		'^#!.*[/\\]groovy\>'
+syn match groovyLineComment       '^\%1l#!.*'  " Shebang line
 syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
 
 " Groovy JDK stuff
diff --git a/runtime/syntax/kconfig.vim b/runtime/syntax/kconfig.vim
index a6ceb1712a..c7a305b73c 100644
--- a/runtime/syntax/kconfig.vim
+++ b/runtime/syntax/kconfig.vim
@@ -1,6 +1,9 @@
 " Vim syntax file
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2009-05-25
+" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-05-29
+" License:              Vim (see :h license)
+" Repository:		https://github.com/chrisbra/vim-kconfig
 
 if exists("b:current_syntax")
   finish
diff --git a/runtime/syntax/po.vim b/runtime/syntax/po.vim
index c09b960357..2ab13ac0b1 100644
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	po (gettext)
 " Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
-" Last Change:	2012 Apr 30
+" Last Change:	2015 Jun 07
 " Contributors: Dwayne Bailey (Most advanced syntax highlighting)
 "               Leonardo Fontenelle (Spell checking)
 "               Nam SungHyun <namsh@kldp.org> (Original maintainer)
@@ -52,6 +52,9 @@ syn match     poCommentTranslator "^# .*$" contains=poCopyrightUnset
 syn match     poCommentAutomatic "^#\..*$" 
 syn match     poCommentSources	"^#:.*$"
 syn match     poCommentFlags "^#,.*$" contains=poFlagFuzzy
+syn match     poDiffOld '\(^#| "[^{]*+}\|{+[^}]*+}\|{+[^}]*\|"$\)' contained
+syn match     poDiffNew '\(^#| "[^{]*-}\|{-[^}]*-}\|{-[^}]*\|"$\)' contained
+syn match     poCommentDiff "^#|.*$" contains=poDiffOld,poDiffNew
 
 " Translations (also includes header fields as they appear in a translation msgstr)
 syn region poCommentKDE	  start=+"_: +ms=s+1 end="\\n" end="\"\n^msgstr"me=s-1 contained
@@ -94,8 +97,11 @@ if version >= 508 || !exists("did_po_syn_inits")
   HiLink poCommentAutomatic  Comment
   HiLink poCommentTranslator Comment
   HiLink poCommentFlags      Special
+  HiLink poCommentDiff       Comment
   HiLink poCopyrightUnset    Todo
   HiLink poFlagFuzzy         Todo
+  HiLink poDiffOld           Todo
+  HiLink poDiffNew          Special
   HiLink poObsolete         Comment
 
   HiLink poStatementMsgid   Statement
diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim
index c3feb97816..a2d5824d3e 100644
--- a/runtime/syntax/rc.vim
+++ b/runtime/syntax/rc.vim
@@ -1,7 +1,10 @@
 " Vim syntax file
 " Language:	M$ Resource files (*.rc)
-" Maintainer:	Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de>
-" Last Change:	2001 May 09
+" Maintainer:	Christian Brabandt
+" Last Change:	2015-05-29
+" Repository:   https://github.com/chrisbra/vim-rc-syntax
+" License:	Vim (see :h license)
+" Previous Maintainer:	Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de>
 
 " This file is based on the c.vim
 
@@ -21,7 +24,7 @@ syn keyword rcMainObject MENU ACCELERATORS TOOLBAR DIALOG
 syn keyword rcMainObject STRINGTABLE MESSAGETABLE RCDATA DLGINIT DESIGNINFO
 
 syn keyword rcSubObject POPUP MENUITEM SEPARATOR
-syn keyword rcSubObject CONTROL LTEXT CTEXT EDITTEXT
+syn keyword rcSubObject CONTROL LTEXT CTEXT RTEXT EDITTEXT
 syn keyword rcSubObject BUTTON PUSHBUTTON DEFPUSHBUTTON GROUPBOX LISTBOX COMBOBOX
 syn keyword rcSubObject FILEVERSION PRODUCTVERSION FILEFLAGSMASK FILEFLAGS FILEOS
 syn keyword rcSubObject FILETYPE FILESUBTYPE
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index db51fa5034..c76b046d8c 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -3,7 +3,7 @@
 " Maintainer:	Daniel Kho <daniel.kho@tauhop.com>
 " Previous Maintainer:	Czo <Olivier.Sirol@lip6.fr>
 " Credits:	Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
-" Last Changed:	2012 Feb 03 by Thilo Six
+" Last Changed:	2015 Apr 25 by Daniel Kho
 " $Id: vhdl.vim,v 1.1 2004/06/13 15:34:56 vimboss Exp $
 
 " VHSIC (Very High Speed Integrated Circuit) Hardware Description Language
@@ -160,10 +160,20 @@ syn match   vhdlSpecial  "[().,;]"
 syn match vhdlTime "\<\d\+\s\+\(\([fpnum]s\)\|\(sec\)\|\(min\)\|\(hr\)\)\>"
 syn match vhdlTime "\<\d\+\.\d\+\s\+\(\([fpnum]s\)\|\(sec\)\|\(min\)\|\(hr\)\)\>"
 
-syn keyword vhdlTodo contained TODO FIXME
-
-syn region vhdlComment start="/\*" end="\*/" contains=vhdlTodo,@Spell
-syn match vhdlComment "--.*" contains=vhdlTodo,@Spell
+syn keyword vhdlTodo	contained TODO NOTE
+syn keyword vhdlFixme	contained FIXME
+
+" Regex for space is '\s'
+"   Any number of spaces: \s*
+"   At least one space:	  \s+
+syn region vhdlComment start="/\*" end="\*/" contains=vhdlTodo,vhdlFixme,@Spell
+syn match vhdlComment "--.*" contains=vhdlTodo,vhdlFixme,@Spell
+syn match vhdlPreProc "/\* synthesis .* \*/"
+syn match vhdlPreProc "/\* pragma .* \*/"
+syn match vhdlPreProc "/\* synopsys .* \*/"
+syn match vhdlPreProc "--\s*synthesis .*"
+syn match vhdlPreProc "--\s*pragma .*"
+syn match vhdlPreProc "--\s*synopsys .*"
 " syn match vhdlGlobal "[\'$#~!%@?\^\[\]{}\\]"
 
 "Modify the following as needed.  The trade-off is performance versus functionality.
@@ -180,21 +190,22 @@ if version >= 508 || !exists("did_vhdl_syntax_inits")
     command -nargs=+ HiLink hi def link <args>
   endif
 
-"  HiLink cDefine       PreProc
-  HiLink vhdlSpecial   Special
-  HiLink vhdlStatement Statement
-  HiLink vhdlCharacter Character
-  HiLink vhdlString    String
-  HiLink vhdlVector    Number
-  HiLink vhdlBoolean   Number
-  HiLink vhdlTodo      Todo
-  HiLink vhdlComment   Comment
-  HiLink vhdlNumber    Number
-  HiLink vhdlTime      Number
-  HiLink vhdlType      Type
-  HiLink vhdlOperator  Special
+  HiLink vhdlSpecial	Special
+  HiLink vhdlStatement	Statement
+  HiLink vhdlCharacter	Character
+  HiLink vhdlString	String
+  HiLink vhdlVector	Number
+  HiLink vhdlBoolean  	Number
+  HiLink vhdlTodo	Todo
+  HiLink vhdlFixme	Fixme
+  HiLink vhdlComment	Comment
+  HiLink vhdlNumber	Number
+  HiLink vhdlTime	Number
+  HiLink vhdlType	Type
+  HiLink vhdlOperator	Operator
 "  HiLink vhdlGlobal    Error
-  HiLink vhdlAttribute Type
+  HiLink vhdlAttribute	Special
+  HiLink vhdlPreProc	PreProc
 
   delcommand HiLink
 endif
diff --git a/runtime/syntax/zsh.vim b/runtime/syntax/zsh.vim
index 79fd017ee8..5e588e7d6c 100644
--- a/runtime/syntax/zsh.vim
+++ b/runtime/syntax/zsh.vim
@@ -1,7 +1,10 @@
 " Vim syntax file
-" Language:         Zsh shell script
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2010-01-23
+" Language:             Zsh shell script
+" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-05-29
+" License:              Vim (see :h license)
+" Repository:		https://github.com/chrisbra/vim-zsh
 
 if exists("b:current_syntax")
   finish
@@ -14,7 +17,7 @@ setlocal iskeyword+=-
 
 syn keyword zshTodo             contained TODO FIXME XXX NOTE
 
-syn region  zshComment          oneline start='\%(^\|\s\)#' end='$'
+syn region  zshComment          oneline start='\%(^\|\s*\)#' end='$'
                                 \ contains=zshTodo,@Spell
 
 syn match   zshPreProc          '^\%1l#\%(!\|compdef\|autoload\).*$'
@@ -30,7 +33,7 @@ syn match   zshJobSpec          '%\(\d\+\|?\=\w\+\|[%+-]\)'
 
 syn keyword zshPrecommand       noglob nocorrect exec command builtin - time
 
-syn keyword zshDelimiter        do done
+syn keyword zshDelimiter        do done end
 
 syn keyword zshConditional      if then elif else fi case in esac select
 
@@ -64,7 +67,7 @@ syn region  zshHereDoc          matchgroup=zshRedir
                                 \ end='^\s*\z1\>'
                                 \ contains=@zshSubst
 syn region  zshHereDoc          matchgroup=zshRedir
-                                \ start=+<\@<!<<\s*\(["']\)\z(\S\+\)\1+ 
+                                \ start=+<\@<!<<\s*\(["']\)\z(\S\+\)\1+
                                 \ end='^\z1\>'
 syn region  zshHereDoc          matchgroup=zshRedir
                                 \ start=+<\@<!<<-\s*\(["']\)\z(\S\+\)\1+
@@ -121,6 +124,165 @@ syn keyword zshCommands         alias autoload bg bindkey break bye cap cd
                                 \ zmodload zparseopts zprof zpty zregexparse
                                 \ zsocket zstyle ztcp
 
+" Options, generated by: echo ${(j:\n:)options[(I)*]} | sort
+syn case ignore
+syn keyword zshOptions          aliases allexport all_export alwayslastprompt
+                                \ always_lastprompt alwaystoend always_to_end
+                                \ appendhistory append_history autocd autocontinue
+                                \ auto_continue autolist auto_list
+                                \ automenu auto_menu autonamedirs auto_name_dirs
+                                \ autoparamkeys auto_param_keys autoparamslash
+                                \ auto_param_slash autopushd auto_pushd autoremoveslash
+                                \ auto_remove_slash autoresume auto_resume badpattern
+                                \ banghist bang_hist bareglobqual bare_glob_qual
+                                \ bashautolist bash_auto_list bashrematch bash_rematch
+                                \ beep bgnice braceccl brace_ccl braceexpand brace_expand
+                                \ bsdecho bsd_echo caseglob case_glob casematch case_match
+                                \ cbases cdablevars cd_able_vars chasedots chase_dots
+                                \ chaselinks chase_links checkjobs check_jobs
+                                \ clobber combiningchars combining_chars completealiases
+                                \ complete_aliases completeinword complete_in_word
+                                \ continueonerror continue_on_error correct
+                                \ correctall correct_all cprecedences c_precedences
+                                \ cshjunkiehistory csh_junkie_history cshjunkieloops
+                                \ csh_junkie_loops cshjunkiequotes csh_junkie_quotes
+                                \ cshnullcmd csh_null_cmd cshnullglob csh_null_glob
+                                \ debugbeforecmd debug_before_cmd dotglob dot_glob dvorak
+                                \ emacs equals errexit err_exit errreturn err_return evallineno
+                                \ eval_lineno exec extendedglob extended_glob extendedhistory
+                                \ extended_history flowcontrol flow_control forcefloat
+                                \ force_float functionargzero function_arg_zero glob globalexport
+                                \ global_export globalrcs global_rcs globassign glob_assign
+                                \ globcomplete glob_complete globdots glob_dots glob_subst
+                                \ globsubst hashall hash_all hashcmds hash_cmds hashdirs
+                                \ hash_dirs hashexecutablesonly hash_executables_only hashlistall
+                                \ hash_list_all histallowclobber hist_allow_clobber histappend
+                                \ hist_append histbeep hist_beep hist_expand hist_expire_dups_first
+                                \ histexpand histexpiredupsfirst histfcntllock hist_fcntl_lock
+                                \ histfindnodups hist_find_no_dups histignorealldups
+                                \ hist_ignore_all_dups histignoredups hist_ignore_dups
+                                \ histignorespace hist_ignore_space histlexwords hist_lex_words
+                                \ histnofunctions hist_no_functions histnostore hist_no_store
+                                \ histreduceblanks hist_reduce_blanks histsavebycopy
+                                \ hist_save_by_copy histsavenodups hist_save_no_dups
+                                \ histsubstpattern hist_subst_pattern histverify hist_verify
+                                \ hup ignorebraces ignore_braces ignoreclosebraces ignore_close_braces
+                                \ ignoreeof ignore_eof incappendhistory inc_append_history
+                                \ incappendhistorytime inc_append_history_time interactive
+                                \ interactivecomments interactive_comments ksharrays ksh_arrays
+                                \ kshautoload ksh_autoload kshglob ksh_glob kshoptionprint
+                                \ ksh_option_print kshtypeset ksh_typeset kshzerosubscript
+                                \ ksh_zero_subscript listambiguous list_ambiguous listbeep
+                                \ list_beep listpacked list_packed listrowsfirst list_rows_first
+                                \ listtypes list_types localloops local_loops localoptions
+                                \ local_options localpatterns local_patterns localtraps
+                                \ local_traps log login longlistjobs long_list_jobs magicequalsubst
+                                \ magic_equal_subst mailwarn mail_warn mail_warning mark_dirs
+                                \ mailwarning markdirs menucomplete menu_complete monitor
+                                \ multibyte multi_byte multifuncdef multi_func_def multios
+                                \ multi_os nomatch no_match notify nullglob null_glob numericglobsort
+                                \ numeric_glob_sort octalzeroes octal_zeroes onecmd one_cmd
+                                \ overstrike over_strike pathdirs path_dirs pathscript
+                                \ path_script physical pipefail pipe_fail posixaliases
+                                \ posix_aliases posixargzero posix_arg_zero posixbuiltins 
+                                \ posix_builtins posixcd posix_cd posixidentifiers posix_identifiers
+                                \ posixjobs posix_jobs posixstrings posix_strings posixtraps
+                                \ posix_traps printeightbit print_eight_bit printexitvalue
+                                \ print_exit_value privileged promptbang prompt_bang promptcr
+                                \ prompt_cr promptpercent prompt_percent promptsp prompt_sp
+                                \ promptsubst prompt_subst promptvars prompt_vars pushdignoredups
+                                \ pushd_ignore_dups pushdminus pushd_minus pushdsilent pushd_silent
+                                \ pushdtohome pushd_to_home rcexpandparam rc_expandparam rcquotes
+                                \ rc_quotes rcs recexact rec_exact rematchpcre re_match_pcre
+                                \ restricted rmstarsilent rm_star_silent rmstarwait rm_star_wait
+                                \ sharehistory share_history shfileexpansion sh_file_expansion
+                                \ shglob sh_glob shinstdin shin_stdin shnullcmd sh_nullcmd
+                                \ shoptionletters sh_option_letters shortloops short_loops shwordsplit
+                                \ sh_word_split singlecommand single_command singlelinezle single_line_zle
+                                \ sourcetrace source_trace stdin sunkeyboardhack sun_keyboard_hack
+                                \ trackall track_all transientrprompt transient_rprompt
+                                \ trapsasync trapasync typesetsilent type_set_silent unset verbose vi
+                                \ warncreateglobal warn_create_global xtrace zle
+
+syn keyword zshOptions          noaliases no_aliases noallexport no_allexport noall_export no_all_export noalwayslastprompt no_alwayslastprompt
+                                \ noalways_lastprompt no_always_lastprompt noalwaystoend no_alwaystoend noalways_to_end no_always_to_end
+                                \ noappendhistory no_appendhistory noappend_history no_append_history noautocd no_autocd noautocontinue no_autocontinue
+                                \ noauto_continue no_auto_continue noautolist no_autolist noauto_list no_auto_list
+                                \ noautomenu no_automenu noauto_menu no_auto_menu noautonamedirs no_autonamedirs noauto_name_dirs no_auto_name_dirs