updated for version 7.0097

runtime/compiler/bdf.vim

@@ -1,16 +1,14 @@
 " Vim compiler file
 " Compiler:         BDF to PCF Conversion
-" Maintainer:	    Nikolai Weibull <sourc@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/compiler/pcp/bdf/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
-" arch-tag:	    2e2f3a55-199b-468c-aa2e-d6b1a7b87806
 
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "bdf"
 
-if exists(":CompilerSet") != 2          " older Vim always used :setlocal
+if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>
 endif
 
@@ -26,5 +24,3 @@ CompilerSet errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim: set sts=2 sw=2:

runtime/compiler/gcc.vim

@@ -0,0 +1,30 @@
+" Vim compiler file
+" Compiler:         GNU C Compiler
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "gcc"
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet errorformat=
+      \%*[^\"]\"%f\"%*\\D%l:\ %m,
+      \\"%f\"%*\\D%l:\ %m,
+      \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once,
+      \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.),
+      \%f:%l:\ %m,
+      \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
+      \%DMaking\ %*\\a\ in\ %f
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/rst.vim

@@ -1,16 +1,14 @@
 " Vim compiler file
 " Compiler:         reStructuredText Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/compiler/pcp/rst/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
-" arch-tag:	    ac64a95a-5d45-493d-a9f9-f96fc8568657
 
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "rst"
 
-if exists(":CompilerSet") != 2          " older Vim always used :setlocal
+if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>
 endif
 
@@ -29,5 +27,3 @@ CompilerSet errorformat=
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim: set sts=2 sw=2:

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 28
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -3781,8 +3781,8 @@ sort({list} [, {func}])					*sort()* *E702*
 soundfold({word})
 		Return the sound-folded equivalent of {word}.  Uses the first
 		language in 'spellang' for the current window that supports
-		soundfolding.  When no sound folding is possible the {word}
+		soundfolding.  'spell' must be set.  When no sound folding is
-		is returned unmodified.
+		possible the {word} is returned unmodified.
 		This can be used for making spelling suggestions.  Note that
 		the method can be quite slow.
 
@@ -3808,8 +3808,8 @@ spellsuggest({word} [, {max}])
 		first entry, thus this can be used to check spelling.
 
 		The spelling information for the current window is used.  The
-		'spell' option must be set and the value of 'spelllang' is
+		'spell' option must be set and the values of 'spelllang' and
-		used.
+		'spellsuggest' are used.
 
 
 split({expr} [, {pattern} [, {keepempty}]])			*split()*

runtime/doc/spell.txt

@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 28
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -706,7 +706,8 @@ Example:
 	SAL C                    K ~
 	SAL K                    K ~
 
-TODO: explain how it works.
+An explantion how it works can be found in the Aspell manual:
+http://aspell.net/man-html/Phonetic-Code.html.
 
 There are a few special items:
 
@@ -716,4 +717,32 @@ There are a few special items:
 
 "1" has the same meaning as "true".  Any other value means "false".
 
+
+SIMPLE SOUNDFOLDING		*spell-affix-SOFOFROM* *spell-affix-SOFOTO*
+
+The SAL mechanism is complex and slow.  A simpler mechanism is mapping all
+characters to another character, mapping similar sounding characters to the
+same character.  At the same time this does case folding.  You can not have
+SAL items at the same time.
+
+There are two items required: one to speficy the characters that are mapped
+and one that specifies the characters they are mapped to.  They must have
+exactly the same number of characters.  Example:
+
+    SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ~
+    SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkes ~
+
+In the example all vowels are mapped to the same character 'e'.  Another
+method is to leave out all vowels.  Some characters that sound nearly the same
+and are often mixed up, such as 'm' and 'n', are mapped to the same character.
+Don't do this too much, all words will start looking alike.
+
+Characters that do not appear in SOFOFROM will be left out, except that all
+white space is replaced by one space.  Sequences of the same character in
+SOFOFROM are replaced by one.
+
+You can use the |soundfold()| function to try out the results.  Or set the
+'verbose' option to see the score in the output of the |z?| command.
+
+
  vim:tw=78:sw=4:ts=8:ft=help:norl:

runtime/doc/tags

@@ -2415,6 +2415,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :spelld	spell.txt	/*:spelld*
 :spelldump	spell.txt	/*:spelldump*
 :spellgood	spell.txt	/*:spellgood*
+:spellr	spell.txt	/*:spellr*
+:spellrepall	spell.txt	/*:spellrepall*
 :spellw	spell.txt	/*:spellw*
 :spellwrong	spell.txt	/*:spellwrong*
 :split	windows.txt	/*:split*
@@ -3710,6 +3712,8 @@ E749	eval.txt	/*E749*
 E75	vi_diff.txt	/*E75*
 E750	repeat.txt	/*E750*
 E751	spell.txt	/*E751*
+E752	spell.txt	/*E752*
+E753	spell.txt	/*E753*
 E754	spell.txt	/*E754*
 E756	spell.txt	/*E756*
 E758	spell.txt	/*E758*
@@ -5141,6 +5145,7 @@ hebrew	hebrew.txt	/*hebrew*
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
+help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
@@ -6253,6 +6258,7 @@ sniff-compiling	if_sniff.txt	/*sniff-compiling*
 sniff-intro	if_sniff.txt	/*sniff-intro*
 sort()	eval.txt	/*sort()*
 sorting	change.txt	/*sorting*
+soundfold()	eval.txt	/*soundfold()*
 space	intro.txt	/*space*
 spec-customizing	pi_spec.txt	/*spec-customizing*
 spec-how-to-use-it	pi_spec.txt	/*spec-how-to-use-it*
@@ -6275,6 +6281,8 @@ spell-affix-RAR	spell.txt	/*spell-affix-RAR*
 spell-affix-REP	spell.txt	/*spell-affix-REP*
 spell-affix-SAL	spell.txt	/*spell-affix-SAL*
 spell-affix-SFX	spell.txt	/*spell-affix-SFX*
+spell-affix-SOFOFROM	spell.txt	/*spell-affix-SOFOFROM*
+spell-affix-SOFOTO	spell.txt	/*spell-affix-SOFOTO*
 spell-affix-UPP	spell.txt	/*spell-affix-UPP*
 spell-affix-chars	spell.txt	/*spell-affix-chars*
 spell-affix-mbyte	spell.txt	/*spell-affix-mbyte*

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 28
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,8 +30,6 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-send fixes for ccmalloc port to FreeBSD.
-
 Add extra list of file locations.  Can be used with:
     :ltag	      list of matching tags, like :tselect
 
@@ -100,12 +98,8 @@ PLANNED FOR VERSION 7.0:
 
 -   Add SPELLCHECKER, with support for many languages.
   - Spell checking code todo's:
-	- Code for making suggestions:
+    - Dutch: badword "voorjaarsconferentie"; "najaarsconferentie" gets zero
-	  - Hebrew: also use prefixes for suggestions.  See message from
+      soundfold score.
-	    Kaminsky (June 20) for ideas.
-	  - Simple and fast sound-a-like: mapping list for first char and rest
-		    vowel as first char: *
-		    remove other vowels
     - Proofread and cleanup spell help.
     - Use "engspchk" from Charles Campbell for ideas (commands, rare words).
     - Make "en-rare" spell file?  Ask Charles Campbell.

runtime/doc/version7.txt

@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 25
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -305,6 +305,7 @@ Options: ~
 			(idea by Hugo Haas)
 'spell'			switch spell checking on/off
 'spelllang'		languages to check spelling for
+'spellsuggest'		methods for spell suggestions
 'verbosefile'		Log messages in a file.
 
 
@@ -377,7 +378,10 @@ New functions: ~
 |reverse()|		reverse the order of a List
 |setqflist()|		create a quickfix list (Yegappan Lakshmanan)
 |sort()|		sort a List
+|soundfold()|		get the sound-a-like equivalent of a word
 |split()|		split a String into a List
+|spellbadword()|	get a badly spelled word
+|spellsuggest()|	get suggestions for correct spelling
 |string()|		String representation of a List or Dictionary
 |system()|		Filters {input} through a shell command.
 |taglist()|		Get list of matching tags. (Yegappan Lakshmanan)
@@ -435,6 +439,8 @@ Sive syntax file. (Nikolai Weibull)
 
 Pascal indent file. (Neil Carter)
 
+Many filetype plugins and others from Nikolai Weibull.
+
 Moved all the indent settings from the filetype plugin to the indent file.
 Implemented b:undo_indent to undo indent settings when setting 'filetype' to a
 different value.
@@ -1146,4 +1152,11 @@ It was possible to define a function with illegal name, e.t. ":func F{-1}()"
 
 CTRL-W F and "gf" didn't use the same method to get the file name.
 
+When reporting a conversion error the line number of the last error could be
+given.  Now report the first encountered error.
+
+When using ":e ++enc=name file" and iconv() was used for conversion an error
+caused a fallback to no conversion.  Now replace a character with '?' and
+continue.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 17
+" Last Change:	2005 Jun 29
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -194,6 +194,9 @@ au BufNewFile,BufRead *.atl,*.as		setf atlas
 " Automake
 au BufNewFile,BufRead [mM]akefile.am		setf automake
 
+" Autotest .at files are actually m4
+au BufNewFile,BufRead *.at			setf m4
+
 " Avenue
 au BufNewFile,BufRead *.ave			setf ave
 
@@ -733,12 +736,18 @@ au BufNewFile,BufRead *.ace,*.ACE		setf lace
 " Latte
 au BufNewFile,BufRead *.latte,*.lte		setf latte
 
+" Limits
+au BufNewFile,BufRead /etc/limits		setf limits
+
 " LambdaProlog (*.mod too, see Modsim)
 au BufNewFile,BufRead *.sig			setf lprolog
 
 " LDAP LDIF
 au BufNewFile,BufRead *.ldif			setf ldif
 
+" Ld loader
+au BufNewFile,BufRead *.ld			setf ld
+
 " Lex
 au BufNewFile,BufRead *.lex,*.l			setf lex
 
@@ -761,9 +770,18 @@ else
   au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,.emacs,.sawfishrc setf lisp
 endif
 
+" SBCL implementation of Common Lisp
+au BufNewFile,BufRead sbclrc,.sbclrc		setf lisp
+
 " Lite
 au BufNewFile,BufRead *.lite,*.lt		setf lite
 
+" Login access
+au BufNewFile,BufRead /etc/login.access		setf loginaccess
+
+" Login defs
+au BufNewFile,BufRead /etc/login.defs		setf logindefs
+
 " Logtalk
 au BufNewFile,BufRead *.lgt			setf logtalk
 
@@ -990,6 +1008,9 @@ au BufNewFile,BufRead *.ora			setf ora
 " Packet filter conf
 au BufNewFile,BufRead pf.conf			setf pf
 
+" Pam conf
+au BufNewFile,BufRead /etc/pam.conf		setf pamconf
+
 " PApp
 au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
 
@@ -1535,6 +1556,9 @@ au BufNewFile,BufRead *.stp			setf stp
 " Standard ML
 au BufNewFile,BufRead *.sml			setf sml
 
+" Sysctl
+au BufNewFile,BufRead /etc/sysctl.conf		setf sysctl
+
 " Sudoers
 au BufNewFile,BufRead /etc/sudoers,sudoers.tmp	setf sudoers
 
@@ -1593,6 +1617,9 @@ au BufNewFile,BufRead *.uit,*.uil		setf uil
 " UnrealScript
 au BufNewFile,BufRead *.uc			setf uc
 
+" Updatedb
+au BufNewFile,BufRead /etc/updatedb.conf	setf updatedb
+
 " Verilog HDL
 au BufNewFile,BufRead *.v			setf verilog
 
@@ -1673,6 +1700,9 @@ au BufNewFile,BufRead XF86Config
 " Xorg config
 au BufNewFile,BufRead xorg.conf,xorg.conf-4	let b:xf86c_xfree86_version = 4 | setf xf86conf
 
+" Xinetd conf
+au BufNewFile,BufRead /etc/xinetd.conf		setf xinetd
+
 " XS Perl extension interface language
 au BufNewFile,BufRead *.xs			setf xs
 
@@ -1709,7 +1739,23 @@ au BufNewFile,BufRead *.xsd			setf xsd
 au BufNewFile,BufRead *.xsl,*.xslt		setf xslt
 
 " Yacc
-au BufNewFile,BufRead *.y,*.yy			setf yacc
+au BufNewFile,BufRead *.yy			setf yacc
+
+" Yacc or racc
+au BufNewFile,BufRead *.y			call s:FTy()
+
+fun! s:FTy()
+  let n = 1
+  while n < 10
+    if getline(n) =~ '^\s*\(#\|class\>\)'
+      setf racc
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf yacc
+endfun
+
 
 " Yaml
 au BufNewFile,BufRead *.yaml,*.yml		setf yaml
@@ -1794,6 +1840,9 @@ au BufNewFile,BufRead muttrc*,Muttrc*		call s:StarSetf('muttrc')
 " Nroff macros
 au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
 
+" Pam conf
+au BufNewFile,BufRead /etc/pam.d/*		call s:StarSetf('pamconf')
+
 " Printcap and Termcap
 au BufNewFile,BufRead *printcap*
 	\ if !did_filetype()
@@ -1825,6 +1874,9 @@ au BufNewFile,BufRead XF86Config*
 " X11 xmodmap
 au BufNewFile,BufRead *xmodmap*			call s:StarSetf('xmodmap')
 
+" Xinetd conf
+au BufNewFile,BufRead /etc/xinetd.d/*		call s:StarSetf('xinetd')
+
 " Z-Shell script
 au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
 

runtime/ftplugin/alsaconf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         alsaconf(8) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/arch.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         GNU Arch inventory file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/automake.vim

@@ -1,11 +1,10 @@
 " Vim filetype plugin file
-" Langugage:	    Automake
+" Language:         Automake
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/automake/
+" Latest Revision:  2005-06-22
-" Latest Revision:  2004-05-22
+
-" arch-tag:	    3a78b0cd-27b2-410a-8e7b-51a1717c2a5b
+if exists("b:did_ftplugin")
+  finish
+endif
 
-" Same as makefile filetype plugin for now.
 runtime! ftplugin/make.vim ftplugin/make_*.vim ftplugin/make/*.vim
-
-" vim: set sts=2 sw=2:

runtime/ftplugin/bdf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         BDF font definition
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-22
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=b:COMMENT commentstring=COMMENT\ %s

runtime/ftplugin/calendar.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         calendar(1) input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring& include&

runtime/ftplugin/changelog.vim

@@ -1,9 +1,7 @@
 " Vim filetype plugin file
 " Language:         generic Changelog file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/changelog/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    b00e2974-c559-4477-b7b2-3ef3f4061bdb
 " Variables:
 "   g:changelog_timeformat -
 "       description: the timeformat used in ChangeLog entries.
@@ -28,16 +26,13 @@
 
 " If 'filetype' isn't "changelog", we must have been to add ChangeLog opener
 if &filetype == "changelog"
-  " Only do this when not done yet for this buffer
   if exists("b:did_ftplugin")
     finish
   endif
-
-  " Don't load another plugin for this buffer
   let b:did_ftplugin = 1
 
-  let cpo_save = &cpo
+  let s:cpo_save = &cpo
-  set cpo-=C
+  set cpo&vim
 
   " The format of the date-time field (should have been called dateformat)
   if !exists("g:changelog_timeformat")
@@ -216,7 +211,7 @@ if &filetype == "changelog"
     command! -nargs=0 NewChangelogEntry call s:new_changelog_entry()
   endif
 
-  let b:undo_ftplugin = "setl com< tw< fo< et<"
+  let b:undo_ftplugin = "setl com< tw< fo< et< ai<"
 
   if &textwidth == 0
     setlocal textwidth=78
@@ -224,9 +219,10 @@ if &filetype == "changelog"
   setlocal comments=
   setlocal formatoptions+=t
   setlocal noexpandtab
-  " setlocal autoindent     now in indent file
+  setlocal autoindent
 
-  let &cpo = cpo_save
+  let &cpo = s:cpo_save
+  unlet s:cpo_save
 else
   " Add the Changelog opening mapping
   nmap <silent> <Leader>o :call <SID>open_changelog()<CR>
@@ -252,5 +248,3 @@ else
     endif
   endfunction
 endif
-
-" vim: set sts=2 sw=2:

runtime/ftplugin/conf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         generic configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/context.vim

@@ -0,0 +1,36 @@
+" Vim filetype plugin file
+" Language:         ConTeXt typesetting engine
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< def< inc< sua<"
+
+setlocal comments=:%,b:%D,b:%C,b:%M commentstring=%\ %s
+
+let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
+        \ .     'def\|\\font\|\\\%(future\)\=let'
+        \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
+        \ .     '\|fam\|insert\|if\)'
+
+let &l:include = '^\s*\%(input\|component\)'
+
+setlocal suffixesadd=.tex
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
+  let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
+        \ '\\start\(\a\+\):\\stop\1'
+endif " exists("loaded_matchit")
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/ftplugin/crm.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         CRM114
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/css.vim

@@ -1,20 +1,15 @@
 " Vim filetype plugin file
 " Language:         CSS
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/css/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    5fa7c74f-bf1a-47c4-b06f-6efe8f48db3b
 
-" Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
   finish
 endif
-
-" Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl com<"
+let b:undo_ftplugin = "setl com< cms< inc<"
 
-setlocal comments=s1:/*,mb:*,ex:*/
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
 
-" vim: set sts=2 sw=2:
+let &l:include = '^\s*@import\s\+\%(url(\)\='

runtime/ftplugin/cvsrc.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         cvs(1) RC file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments= commentstring=

runtime/ftplugin/dircolors.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         dircolors(1) input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/elinks.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         elinks(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/eterm.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         eterm(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include

runtime/ftplugin/fetchmail.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         fetchmail(1) RC File
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/gpg.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         gpg(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/grub.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         grub(8) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/haskell.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Haskell
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_plugin = "setl com< cms<"
+
+setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s

runtime/ftplugin/help.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Vim help file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_plugin = "setl fo< tw<"
+
+setlocal formatoptions+=tcroql textwidth=78

runtime/ftplugin/indent.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         indent(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com<"
+
+setlocal comments=s1:/*,mb:*,ex:*/

runtime/ftplugin/ld.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         ld(1) script
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*%s*/ include=^\\s*INCLUDE

runtime/ftplugin/lftp.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         lftp(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/libao.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         libao.conf(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/limits.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         limits(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/loginaccess.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         login.access(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/logindefs.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         login.defs(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/m4.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         m4
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:#,:dnl commentstring=dnl\ %s

runtime/ftplugin/mailcap.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Mailcap configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+set comments=:# commentstring=#\ %s

runtime/ftplugin/modconf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         modules.conf(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include

runtime/ftplugin/mplayerconf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         mplayer(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include

runtime/ftplugin/muttrc.vim

@@ -0,0 +1,15 @@
+" Vim filetype plugin file
+" Language:         mutt RC File
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=:# commentstring=#\ %s
+
+let &l:include = '^\s*source\>'

runtime/ftplugin/netrc.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         netrc(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments= commentstring=

runtime/ftplugin/pamconf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         pam(8) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/pinfo.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         pinfo(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/procmail.vim

@@ -0,0 +1,15 @@
+" Vim filetype plugin file
+" Language:         procmail(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=:# commentstring=#\ %s
+
+let &l:include = '^\s*INCLUDERC\>'

runtime/ftplugin/prolog.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Prolog
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:% commentstring=%\ %s

runtime/ftplugin/quake.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Quake[1-3] configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:// commentstring=//\ %s

runtime/ftplugin/racc.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Racc input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:# commentstring=#\ %s

runtime/ftplugin/readline.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         readline(3) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/rnc.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Relax NG compact syntax
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/rst.vim

@@ -1,23 +1,13 @@
 " Vim filetype plugin file
-" Language:	    reStructuredText Documentation Format
+" Language:         reStructuredText documentation format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/rst/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    618bf504-81ba-4518-bad2-43ba2b844a26
 
-" Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
   finish
 endif
-
-" Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl com< cms<"
+let b:undo_ftplugin = "setl com< cms< et<"
 
-setlocal comments=fb:..
+setlocal comments=fb:.. commentstring=..\ %s expandtab
-setlocal commentstring=..\ %s
-setlocal expandtab
-setlocal sts=2 sw=2
-
-" vim: set sts=2 sw=2:

runtime/ftplugin/screen.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         screen(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/sieve.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Sieve filtering language input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:# commentstring=#\ %s

runtime/ftplugin/sshconfig.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         OpenSSH client configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/sudoers.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         sudoers(5) configuration files
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/sysctl.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         sysctl.conf(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_plugin = "setl com< cms<"
+
+setlocal comments=:;,:# commentstring=#\ %s

runtime/ftplugin/terminfo.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         terminfo(5) definition
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/updatedb.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         updatedb.conf(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_plugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/xdefaults.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         X resources files like ~/.Xdefaults (xrdb)
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:! commentstring& inc&

runtime/ftplugin/xf86conf.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         XFree86 Configuration File
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:# commentstring=#\ %s

runtime/ftplugin/xinetd.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         xinetd.conf(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< inc<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include

runtime/ftplugin/xmodmap.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         xmodmap(1) definition file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=:! commentstring=!\ %s

runtime/ftplugin/yaml.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         YAML (YAML Ain't Markup Language)
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< et<"
+
+setlocal comments=:# commentstring=#\ %s expandtab

runtime/ftplugin/zsh.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:         Zsh shell script
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms<"
+
+setlocal comments=b:# commentstring=#\ %s

runtime/indent/automake.vim

@@ -1,11 +1,11 @@
 " Vim indent file
 " Language:         automake
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/automake/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
+
-" arch-tag:	    9a2af48c-48d4-4bae-82c3-c801bc9d1976
+if exists("b:did_indent")
+  finish
+endif
 
 " same as makefile indenting for now.
-source <sfile>:p:h/make.vim
+runtime! indent/make.vim
-
-" vim: set sts=2 sw=2:

runtime/indent/config.vim

@@ -1,9 +1,8 @@
 " Vim indent file
 " Language:         Autoconf configure.{ac,in} file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
 " URL:              http://www.pcppopper.org/vim/indent/pcp/config/
-" Latest Revision:  2004-04-25
+" Latest Revision:  2005-06-29
-" arch-tag:	    7779c341-796f-408e-80e4-a55c26b519a4
 " TODO:             how about nested [()]'s in one line
 "                   what's wrong with '\\\@!'?
 
@@ -12,7 +11,7 @@ if exists("b:did_indent")
   finish
 endif
 
-source <sfile>:p:h/sh.vim       " will set b:did_indent
+runtime! indent/sh.vim          " will set b:did_indent
 
 setlocal indentexpr=GetConfigIndent()
 setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done

runtime/indent/css.vim

@@ -1,79 +1,54 @@
 " Vim indent file
 " Language:         CSS
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/css/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    ccfd77a0-1c9a-43f7-a407-bbe704541442
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetCSSIndent()
-setlocal indentkeys-=:,0# indentkeys-=e
+setlocal indentkeys=0{,0},!^F,o,O
 
-" Only define the function once.
 if exists("*GetCSSIndent")
   finish
 endif
 
-function! s:LookupLine(lnum)
+function s:LookupLine(lnum)
-  " find a non-blank line above the current line
   let lnum = prevnonblank(a:lnum - 1)
-
+  while lnum > 0
-  if lnum == 0
-    return 0
-  endif
-
     let line = getline(lnum)
 
-  " if the line has an end comment sequence we need to find a line
-  " that isn't affected by the comment.
     if line =~ '\*/'
-    while line !~ '/\*'
+      while lnum > 0 && line !~ '/\*'
-      let lnum = lnum - 1
+        let lnum -= 1
         let line = getline(lnum)
       endwhile
     endif
 
-  " if the line we found only contained the comment and whitespace
+    if line !~ '^\s*/\*'
-  " we need to find another line to use...
+      return lnum
-  if line =~ '^\s*/\*'
+    end
-    return s:LookupLine(lnum)
+  endwhile
-  else
   return lnum
-  endif
 endfunction
 
 function GetCSSIndent()
-  let lnum = s:LookupLine(v:lnum)
+  let lnum = prevnonblank(v:lnum - 1)
-
   if lnum == 0
     return 0
   endif
 
-  " remove commented stuff from line
-  let line = substitute(getline(lnum), '/\*.\*/', '', 'eg')
-
   let ind = indent(lnum)
 
-  " check for opening brace on the previous line
+  if substitute(getline(lnum), '/\*.*', '', 'e') =~ '{\(.*}\)\@!'
-  " skip if it also contains a closing brace...
-  if line =~ '{\(.*}\)\@!'
     let ind = ind + &sw
   endif
 
-  let line = getline(v:lnum)
+  if getline(v:lnum) =~ '^\s*}'
-
-  " check for closing brace first on current line
-  if line =~ '^\s*}'
     let ind = ind - &sw
   endif
 
   return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/docbk.vim

@@ -1,9 +1,7 @@
 " Vim indent file
 " Language:         DocBook Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/docbk/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
-" arch-tag:	    3d073af7-1d69-42a2-99ad-9a49a21eb28f
 
 if exists("b:did_indent")
   finish
@@ -15,5 +13,3 @@ runtime! indent/xml.vim
 if exists('*XmlIndentGet')
   setlocal indentexpr=XmlIndentGet(v:lnum,0)
 endif
-
-" vim: set sts=2 sw=2:

runtime/indent/eterm.vim

@@ -1,49 +1,35 @@
 " Vim indent file
 " Language:         Eterm configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/eterm/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    a22a92b1-c59f-4f47-8207-b21db6549b21
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetEtermIndent()
 setlocal indentkeys=!^F,o,O,=end
 
-" Only define the function once.
 if exists("*GetEtermIndent")
   finish
 endif
 
 function GetEtermIndent()
-  " Find a non-blank line above the current line.
   let lnum = prevnonblank(v:lnum - 1)
-
-  " Hit the start of the file, use zero indent.
   if lnum == 0
     return 0
   endif
 
-  let line = getline(lnum)
   let ind = indent(lnum)
 
-  if line =~ '^\s*begin\>'
+  if getline(lnum) =~ '^\s*begin\>'
     let ind = ind + &sw
   endif
 
-  let line = getline(v:lnum)
+  if getline(v:lnum) =~ '^\s*end\>'
-
-  " Check for closing brace on current line
-  if line =~ '^\s*end\>'
     let ind = ind - &sw
   endif
 
   return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/ld.vim

@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:         ld(1) script
 " Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision:  2005-06-28
+" Latest Revision:  2005-06-29
 
 if exists("b:did_indent")
   finish

runtime/indent/make.vim

@@ -1,21 +1,16 @@
 " Vim indent file
 " Language:         Makefile
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/make/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    b539e147-a05c-4860-98af-1d2436db2f4b
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetMakeIndent()
 setlocal indentkeys=!^F,o,O
 
-" Only define the function once.
 if exists("*GetMakeIndent")
   finish
 endif
@@ -23,35 +18,28 @@ endif
 function s:GetStringWidth(line, str)
   let end = matchend(a:line, a:str)
   let width = 0
-  let i = 0
+  for c in a:line
-  while i < end
+    if c == "\t"
-    if a:line[i] != "\t"
+      let width += &ts - (width % &ts)
-      let width = width + 1
     else
-      let width = width + &ts - (width % &ts)
+      let width += 1
     endif
-    let i = i + 1
+  endfor
-  endwhile
   return width
 endfunction
 
 function GetMakeIndent()
-  if v:lnum == 1
+  let lnum = v:lnum - 1
+  if lnum == 0
     return 0
   endif
 
-  let ind = indent(v:lnum - 1)
+  let line = getline(lnum)
-  let line = getline(v:lnum - 1)
-
   if line == ''
-    let ind = 0
+    return 0
-  elseif line =~ '^[^ \t#:][^#:]*:\{1,2}\([^=:]\|$\)'
+  elseif line =~ '^[^ \t#:][^#:]*:\{1,2}\%([^=:]\|$\)'
-    let ind = ind + &ts
+    return indent(lnum) + &ts
-  elseif line =~ '^\s*\h\w*\s*=\s*.\+\\$'
+  elseif line =~ '^\s*\h\w*\s*+\==\s*.\+\\$'
-    let ind = s:GetStringWidth(line, '=\s*')
+    return s:GetStringWidth(line, '+\==\s*')
   endif
-
-  return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/readline.vim

@@ -1,48 +1,35 @@
 " Vim indent file
 " Language:         readline configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/readline/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    ee681235-3abf-4a42-8587-edabd409a980
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetReadlineIndent()
 setlocal indentkeys=!^F,o,O,=$else,=$endif
 
-" Only define the function once.
 if exists("*GetReadlineIndent")
   finish
 endif
 
 function GetReadlineIndent()
   let lnum = prevnonblank(v:lnum - 1)
-
   if lnum == 0
     return 0
   endif
 
-  let line = getline(lnum)
   let ind = indent(lnum)
 
-  " increase indent if previous line started with $if or $else
+  if getline(lnum) =~ '^\s*$\(if\|else\)\>'
-  if  line =~ '^\s*$\(if\|else\)\>'
     let ind = ind + &sw
   endif
 
-  let line = getline(v:lnum)
+  if getline(v:lnum) =~ '^\s*$\(else\|endif\)\>'
-
-  " decrease indent if this line starts with $else or $endif
-  if line =~ '^\s*$\(else\|endif\)\>'
     let ind = ind - &sw
   endif
 
   return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/rst.vim

@@ -1,28 +1,22 @@
 " Vim indent file
 " Language:         reStructuredText Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/rst/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    3fe10f75-24d0-4d94-a924-0ce945958104
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetRSTIndent()
-setlocal indentkeys-=:,0# indentkeys-=e
+setlocal indentkeys=!^F,o,O
 
-" Only define the function once.
 if exists("*GetRSTIndent")
   finish
 endif
 
 function GetRSTIndent()
   let lnum = prevnonblank(v:lnum - 1)
-
   if lnum == 0
     return 0
   endif
@@ -56,5 +50,3 @@ function GetRSTIndent()
 
   return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/sh.vim

@@ -1,33 +1,26 @@
 " Vim indent file
 " Language:         Shell Script
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/sh/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    431c7fc1-12a6-4d71-9636-1498ef56b038
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetShIndent()
 setlocal indentkeys+==then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done
 setlocal indentkeys-=:,0#
 
-" Only define the function once.
 if exists("*GetShIndent")
   finish
 endif
 
-set cpoptions-=C
+let s:cpo_save = &cpo
+set cpo&vim
 
 function GetShIndent()
-  " Find a non-blank line above the current line.
   let lnum = prevnonblank(v:lnum - 1)
-
-  " Hit the start of the file, use zero indent.
   if lnum == 0
     return 0
   endif
@@ -37,7 +30,7 @@ function GetShIndent()
   let ind = indent(lnum)
   let line = getline(lnum)
   if line =~ '^\s*\(if\|then\|do\|else\|elif\|case\|while\|until\|for\)\>'
-	\ || line =~ '^\s*\<\h\w*\>\s*()\s*{'
+        \ || line =~ '^\s*\<\k\+\>\s*()\s*{'
         \ || line =~ '^\s*{'
     if line !~ '\(esac\|fi\|done\)\>\s*$' && line !~ '}\s*$'
       let ind = ind + &sw
@@ -55,4 +48,5 @@ function GetShIndent()
   return ind
 endfunction
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/indent/tcl.vim

@@ -1,27 +1,21 @@
 " Vim indent file
 " Language:         Tcl
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/tcl/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-21
-" arch-tag:	    64fab1fa-d670-40ab-a191-55678f20ceb0
 
-" only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetTclIndent()
-setlocal indentkeys-=:,0#
+setlocal indentkeys=0{,0},!^F,o,O,0]
-setlocal indentkeys+=0]
 
-" only define the function once.
 if exists("*GetTclIndent")
   finish
 endif
 
-function s:PrevNonBlankNonComment(lnum)
+function s:prevnonblanknoncomment(lnum)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
     let line = getline(lnum)
@@ -33,91 +27,44 @@ function s:PrevNonBlankNonComment(lnum)
   return lnum
 endfunction
 
-function! GetTclIndent()
+function s:count_braces(lnum, count_open)
-  let lnum = s:PrevNonBlankNonComment(v:lnum - 1)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '\\\@<![{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 1), 'name') !~ 'tcl\%(Comment\|String\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
 
-  if lnum == 0
+function GetTclIndent()
+  let pnum = s:prevnonblanknoncomment(v:lnum - 1)
+  if pnum == 0
     return 0
   endif
 
-  let line = getline(lnum)
+  let ind = indent(pnum) + s:count_braces(pnum, 1) * &sw
-  let ind = indent(lnum)
+  if getline(pnum) =~ '\\$'
-
+    let ind += &sw
-  " TODO: Possible improvement, check that 'begin' and 'end' aren't inside a
-  " comment or string.  This will mess it up.  As I am pressed for time and
-  " stuff like this is unlikely to happen I won't deal with it in this
-  " version.
-  let open = 0
-  let begin = match(line, '{', 0)
-  while begin > -1
-    let end = match(line, '}', begin + 1)
-    if end < 0
-      let open = open + 1
-    else
-      let tmp = match(line, '{', begin + 1)
-      if tmp != -1 && tmp < end
-	let open = open + 1
   endif
+
+  let pnum = s:prevnonblanknoncomment(pnum - 1)
+  if pnum > 0 && getline(pnum) =~ '\\$'
+    let ind -= &sw
   endif
-    let begin = match(line, '{', begin + 1)
-  endwhile
 
-  let begin = match(line, '[', 0)
+  return ind - s:count_braces(v:lnum, 0) * &sw
-  while begin > -1
-    let end = match(line, ']', begin + 1)
-    if end < 0
-      let open = open + 1
-    else
-      let tmp = match(line, '{', begin + 1)
-      if tmp != -1 && tmp < end
-	let open = open + 1
-      endif
-    endif
-    let begin = match(line, '{', begin + 1)
-  endwhile
-
-  let close = 0
-  let prev = 0
-  let end = matchend(line, '^\s*}.*}', prev)
-  while end > -1
-    let begin = match(line, '{', prev + 1)
-    if begin < 0 || begin > prev
-      let close = close + 1
-    endif
-    let prev = end
-    let end = match(line, '}', prev + 1)
-  endwhile
-
-  let prev = 0
-  let end = match(line, ']', prev)
-  while end > -1
-    let begin = match(line, '[', prev + 1)
-    if begin < 0 || begin > prev
-      let close = close + 1
-    endif
-    let prev = end
-    let end = match(line, ']', prev + 1)
-  endwhile
-
-  let ind = ind + (open - close) * &sw
-
-  let line = getline(v:lnum)
-
-  let close = 0
-  let prev = 0
-  let end = match(line, '}', prev)
-  while end > -1
-    let begin = match(line, '{', prev + 1)
-    if begin < 0 || begin > prev
-      let close = close + 1
-    endif
-    let prev = end
-    let end = match(line, '}', prev + 1)
-  endwhile
-
-  let ind = ind - close * &sw
-
-  return ind >= 0 ? ind : 0
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/xf86conf.vim

@@ -1,21 +1,16 @@
 " Vim indent file
 " Language:         XFree86 Configuration File
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/xf86conf/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    8a42f7b6-5088-49cf-b15b-07696a91c015
 
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetXF86ConfIndent()
 setlocal indentkeys=!^F,o,O,=End
 
-" Only define the function once.
 if exists("*GetXF86ConfIndent")
   finish
 endif
@@ -28,15 +23,14 @@ function GetXF86ConfIndent()
   endif
 
   let ind = indent(lnum)
-  let line = getline(lnum)
 
-  if line =~? '^\s*\(Sub\)\=Section'
+  if getline(lnum) =~? '^\s*\(Sub\)\=Section\>'
     let ind = ind + &sw
-  elseif getline(v:lnum) =~? '^\s*End'
+  endif
+
+  if getline(v:lnum) =~? '^\s*End\>'
     let ind = ind - &sw
   endif
 
   return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/xinetd.vim

@@ -0,0 +1,49 @@
+" Vim indent file
+" Language:         xinetd.conf(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-28
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetXinetdIndent()
+setlocal indentkeys=0{,0},!^F,o,O
+
+if exists("*GetXinetdIndent")
+  finish
+endif
+
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'ld\%(Comment\|String\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+function GetXinetdIndent()
+  let pnum = prevnonblank(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  return indent(pnum) + s:count_braces(pnum, 1) * &sw
+        \ - s:count_braces(v:lnum, 0) * &sw
+endfunction

runtime/indent/yacc.vim

@@ -1,9 +1,7 @@
 " Vim indent file
 " Language:         YACC input file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/yacc/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-04-25
-" arch-tag:	    629aa719-8fe4-4787-adb7-ae94ca801610
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -40,5 +38,3 @@ function GetYaccIndent()
 
   return ind
 endfunction
-
-" vim: set sts=2 sw=2:

runtime/indent/zsh.vim

@@ -1,11 +1,11 @@
 " Vim indent file
 " Language:         Zsh Shell Script
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/zsh/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
+
-" arch-tag:	    e566f55f-d8c0-4c60-b4b3-60c0dbd6dea1
+if exists("b:did_indent")
+  finish
+endif
 
 " Same as sh indenting for now.
 runtime! indent/sh.vim
-
-" vim: set sts=2 sw=2:

runtime/syntax/alsaconf.vim

@@ -1,72 +1,51 @@
 " Vim syntax file
-" Language:	    ALSA configuration file
+" Language:         alsaconf(8) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-09-10
-" arch-tag:	    3e06fe53-28d5-44a1-871d-279f22e7aed4
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" todo
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword alsoconfTodo        contained FIXME TODO XXX NOTE
 
-" comments
+syn region  alsaconfComment     matchgroup=alsaconfComment
-syn region  alsaconfComment   matchgroup=alsaconfComment start="#" end="$"
+                                \ start='#' end='$'
-			      \ contains=alsaconfTodo
+                                \ contains=alsaconfTodo,@Spell
 
-" special characters
+syn match   alsaconfSpecialChar contained display '\\[ntvbrf]'
-syn match   alsaconfSpecialChar	contained "\\[ntvbrf]"
+syn match   alsaconfSpecialChar contained display '\\\o\+'
-syn match   alsaconfSpecialChar	contained "\\\o\+"
 
-" strings
+syn region  alsaconfString      matchgroup=alsaconfString
-syn region  alsaconfString    matchgroup=alsaconfString start=+"+ skip=+\\$+
+                                \ start=+"+ skip=+\\$+ end=+"+ end=+$+
-			      \ end=+"+ end=+$+ contains=alsaconfSpecialChar
+                                \ contains=alsaconfSpecialChar
 
-" preprocessor special
+syn match   alsaconfSpecial     contained display 'confdir:'
-syn match   alsaconfSpecial   contained "confdir:"
 
-" preprocessor
+syn region  alsaconfPreProc     matchgroup=alsaconfPreProc start='<' end='>'
-syn region  alsaconfPreProc   matchgroup=alsaconfPreProc start="<" end=">"
                                 \ contains=alsaconfSpecial
 
-" modes
+syn match   alsaconfMode        display '[+?!-]'
-syn match   alsaconfMode      "[+?!-]"
 
-" keywords
 syn keyword alsaconfKeyword     card default device errors files func strings
 syn keyword alsaconfKeyword     subdevice type vars
 
-" variables
+syn match   alsaconfVariables   display '@\(hooks\|func\|args\)'
-syn match   alsaconfVariables "@\(hooks\|func\|args\)"
 
-" Define the default highlighting.
+hi def link alsoconfTodo        Todo
-" For version 5.7 and earlier: only when not done already
+hi def link alsaconfComment     Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link alsaconfSpecialChar SpecialChar
-if version >= 508 || !exists("did_alsaconf_syn_inits")
+hi def link alsaconfString      String
-  if version < 508
+hi def link alsaconfSpecial     Special
-    let did_dircolors_syn_inits = 1
+hi def link alsaconfPreProc     PreProc
-    command -nargs=+ HiLink hi link <args>
+hi def link alsaconfMode        Special
-  else
+hi def link alsaconfKeyword     Keyword
-    command -nargs=+ HiLink hi def link <args>
+hi def link alsaconfVariables   Identifier
-  endif
-
-  HiLink alsoconfTodo	      Todo
-  HiLink alsaconfComment      Comment
-  HiLink alsaconfSpecialChar  SpecialChar
-  HiLink alsaconfString	      String
-  HiLink alsaconfSpecial      Special
-  HiLink alsaconfPreProc      PreProc
-  HiLink alsaconfMode	      Special
-  HiLink alsaconfKeyword      Keyword
-  HiLink alsaconfVariables    Identifier
-
-  delcommand HiLink
-endif
 
 let b:current_syntax = "alsaconf"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/arch.vim

@@ -1,60 +1,35 @@
 " Vim syntax file
-" Language:	    GNU Arch inventory file.
+" Language:         GNU Arch inventory file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/arch/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
-" arch-tag:	    529d60c4-53d8-4d3a-80d6-54ada86d9932
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
+let s:cpo_save = &cpo
-" For version 5.x: Set it globally
+set cpo&vim
-" For version 6.x: Set it locally
+
-if version >= 600
+setlocal iskeyword=@,48-57,_,-
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk @,48-57,_,-
-delcommand SetIsk
 
-" Todo
 syn keyword archTodo    TODO FIXME XXX NOTE
 
-" Comment
+syn region  archComment display matchgroup=archComment
-syn region  archComment  matchgroup=archComment start='^\%(#\|\s\)' end='$' contains=archTodo
+                        \ start='^\%(#\|\s\)' end='$' contains=archTodo,@Spell
 
-" Keywords
 syn keyword archKeyword implicit tagline explicit names
 syn keyword archKeyword untagged-source
-syn keyword archKeyword  exclude junk backup precious unrecognized source skipwhite nextgroup=archRegex
+syn keyword archKeyword exclude junk backup precious unrecognized source
+                        \ skipwhite nextgroup=archRegex
 
-" Regexes
 syn match   archRegex   contained '\s*\zs.*'
 
-" Define the default highlighting.
+hi def link archTodo    Todo
-" For version 5.7 and earlier: only when not done already
+hi def link archComment Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link archKeyword Keyword
-if version >= 508 || !exists("did_arch_syn_inits")
+hi def link archRegex   String
-  if version < 508
-    let did_arch_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink archTodo     Todo
-  HiLink archComment  Comment
-  HiLink archKeyword  Keyword
-  HiLink archRegex    String
-
-  delcommand HiLink
-endif
 
 let b:current_syntax = "arch"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/bdf.vim

@@ -1,86 +1,97 @@
 " Vim syntax file
-" Language:	    BDF Font definition
+" Language:         BDF font definition
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/bdf/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-06
-" arch-tag:	    b696b6ba-af24-41ba-b4eb-d248495eca68
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" numbers
+let s:cpo_save = &cpo
-syn match   bdfNumber	    display "\<\(\x\+\|\d\+\.\d\+\)\>"
+set cpo&vim
 
-" comments
+syn region  bdfFontDefinition transparent matchgroup=bdfKeyword
-syn region  bdfComment	    start="^COMMENT\>" end="$" contains=bdfTodo
+                              \ start='^STARTFONT\>' end='^ENDFONT\>'
+                              \ contains=bdfComment,bdfFont,bdfSize,
+                              \ bdfBoundingBox,bdfProperties,bdfChars,bdfChar
 
-" todo
+syn match   bdfNumber         contained display
-syn keyword bdfTodo	    contained TODO FIXME XXX NOTE
+                              \ '\<\%(\x\+\|[+-]\=\d\+\%(\.\d\+\)*\)'
 
-" strings
+syn keyword bdfTodo           contained FIXME TODO XXX NOTE
-syn region  bdfString	    start=+"+ skip=+""+ end=+"+
 
-" properties
+syn region  bdfComment        contained start='^COMMENT\>' end='$'
-syn keyword bdfProperties   contained FONT SIZE FONTBOUNDINGBOX CHARS
+                              \ contains=bdfTodo,@Spell
 
-" X11 properties
+syn region  bdfFont           contained matchgroup=bdfKeyword
-syn keyword bdfXProperties  contained FONT_ASCENT FONT_DESCENT DEFAULT_CHAR
+                              \ start='^FONT\>' end='$'
-syn keyword bdfXProperties  contained FONTNAME_REGISTRY FOUNDRY FAMILY_NAME
-syn keyword bdfXProperties  contained WEIGHT_NAME SLANT SETWIDTH_NAME PIXEL_SIZE
-syn keyword bdfXProperties  contained POINT_SIZE RESOLUTION_X RESOLUTION_Y SPACING
-syn keyword bdfXProperties  contained CHARSET_REGISTRY CHARSET_ENCODING COPYRIGHT
-syn keyword bdfXProperties  contained ADD_STYLE_NAME WEIGHT RESOLUTION X_HEIGHT
-syn keyword bdfXProperties  contained QUAD_WIDTH FONT AVERAGE_WIDTH
 
-syn region  bdfDefinition   transparent matchgroup=bdfDelim start="^STARTPROPERTIES\>" end="^ENDPROPERTIES\>" contains=bdfXProperties,bdfNumber,bdfString
+syn region  bdfSize           contained transparent matchgroup=bdfKeyword
+                              \ start='^SIZE\>' end='$' contains=bdfNumber
 
-" characters
+syn region  bdfBoundingBox    contained transparent matchgroup=bdfKeyword
-syn keyword bdfCharProperties contained ENCODING SWIDTH DWIDTH BBX ATTRIBUTES BITMAP
+                              \ start='^FONTBOUNDINGBOX' end='$'
+                              \ contains=bdfNumber
 
-syn match   bdfCharName	    contained display "\<[0-9a-zA-Z]\{1,14}\>"
+syn region  bdfProperties     contained transparent matchgroup=bdfKeyword
-syn match   bdfCharNameError contained display "\<[0-9a-zA-Z]\{15,}\>"
+                              \ start='^STARTPROPERTIES' end='^ENDPROPERTIES'
+                              \ contains=bdfNumber,bdfString,bdfProperty,
+                              \ bdfXProperty
 
-syn region  bdfStartChar    transparent matchgroup=bdfDelim start="\<STARTCHAR\>" end="$" contains=bdfCharName,bdfCharNameError
+syn keyword bdfProperty       contained FONT_ASCENT FONT_DESCENT DEFAULT_CHAR
+syn match   bdfProperty       contained '^\S\+'
 
-syn region  bdfCharDefinition transparent start="^STARTCHAR\>" matchgroup=bdfDelim end="^ENDCHAR\>" contains=bdfCharProperties,bdfNumber,bdfStartChar
+syn keyword bdfXProperty      contained FONT_ASCENT FONT_DESCENT DEFAULT_CHAR
+                              \ FONTNAME_REGISTRY FOUNDRY FAMILY_NAME
+                              \ WEIGHT_NAME SLANT SETWIDTH_NAME PIXEL_SIZE
+                              \ POINT_SIZE RESOLUTION_X RESOLUTION_Y SPACING
+                              \ CHARSET_REGISTRY CHARSET_ENCODING COPYRIGHT
+                              \ ADD_STYLE_NAME WEIGHT RESOLUTION X_HEIGHT
+                              \ QUAD_WIDTH FONT AVERAGE_WIDTH
 
-" font
+syn region  bdfString         contained start=+"+ skip=+""+ end=+"+
-syn region  bdfFontDefinition transparent matchgroup=bdfDelim start="^STARTFONT\>" end="^ENDFONT\>" contains=bdfProperties,bdfDefinition,bdfCharDefinition,bdfNumber,bdfComment
+
+syn region  bdfChars          contained display transparent
+                              \ matchgroup=bdfKeyword start='^CHARS' end='$'
+                              \ contains=bdfNumber
+
+syn region  bdfChar           transparent matchgroup=bdfKeyword
+                              \ start='^STARTCHAR' end='^ENDCHAR'
+                              \ contains=bdfEncoding,bdfWidth,bdfAttributes,
+                              \ bdfBitmap
+
+syn region  bdfEncoding       contained transparent matchgroup=bdfKeyword
+                              \ start='^ENCODING' end='$' contains=bdfNumber
+
+syn region  bdfWidth          contained transparent matchgroup=bdfKeyword
+                              \ start='^SWIDTH\|DWIDTH\|BBX' end='$'
+                              \ contains=bdfNumber
+
+syn region  bdfAttributes     contained transparent matchgroup=bdfKeyword
+                              \ start='^ATTRIBUTES' end='$'
+
+syn keyword bdfBitmap         contained BITMAP
 
 if exists("bdf_minlines")
   let b:bdf_minlines = bdf_minlines
 else
-  let b:bdf_minlines = 50
+  let b:bdf_minlines = 30
 endif
-exec "syn sync minlines=" . b:bdf_minlines
+exec "syn sync ccomment bdfChar minlines=" . b:bdf_minlines
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_bdf_syn_inits")
-  if version < 508
-    let did_bdf_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
 
-  HiLink bdfComment		Comment
+hi def link bdfKeyword        Keyword
-  HiLink bdfTodo		Todo
+hi def link bdfNumber         Number
-  HiLink bdfNumber		Number
+hi def link bdfTodo           Todo
-  HiLink bdfString		String
+hi def link bdfComment        Comment
-  HiLink bdfProperties	Keyword
+hi def link bdfFont           String
-  HiLink bdfXProperties	Keyword
+hi def link bdfProperty       Identifier
-  HiLink bdfCharProperties	Structure
+hi def link bdfXProperty      Identifier
-  HiLink bdfDelim		Delimiter
+hi def link bdfString         String
-  HiLink bdfCharName		String
+hi def link bdfChars          Keyword
-  HiLink bdfCharNameError	Error
+hi def link bdfBitmap         Keyword
-  delcommand HiLink
-endif
 
 let b:current_syntax = "bdf"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/calendar.vim

@@ -1,104 +1,111 @@
 " Vim syntax file
-" Language:	    calendar(1) file.
+" Language:         calendar(1) input file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/calendar/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-06
-" arch-tag:	    d714127d-469d-43bd-9c79-c2a46ec54535
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Todo
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword calendarTodo          contained TODO FIXME XXX NOTE
 
-" Comments
+syn region  calendarComment       matchgroup=calendarComment
-syn region  calendarComment	matchgroup=calendarComment start='/\*' end='\*/' contains=calendarTodo
+                                  \ start='/\*' end='\*/'
+                                  \ contains=calendarTodo,@Spell
 
-" Strings
+syn region  calendarCppString     start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl
-syn region  calendarCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=calendarSpecial
+                                  \ end=+"+ end='$' contains=calendarSpecial
 syn match   calendarSpecial       display contained '\\\%(x\x\+\|\o\{1,3}\|.\|$\)'
 syn match   calendarSpecial       display contained "\\\(u\x\{4}\|U\x\{8}\)"
 
-" cpp(1) Preprocessor directives (adapted from syntax/c.vim)
+syn region  calendarPreCondit     start='^\s*#\s*\%(if\|ifdef\|ifndef\|elif\)\>'
-
+                                  \ skip='\\$' end='$'
-syn region  calendarPreCondit	start='^\s*#\s*\%(if\|ifdef\|ifndef\|elif\)\>' skip='\\$' end='$' contains=calendarComment,calendarCppString
+                                  \ contains=calendarComment,calendarCppString
 syn match   calendarPreCondit     display '^\s*#\s*\%(else\|endif\)\>'
-syn region  calendarCppOut	start='^\s*#\s*if\s\+0\+' end='.\@=\|$' contains=calendarCppOut2
+syn region  calendarCppOut        start='^\s*#\s*if\s\+0\+' end='.\@=\|$'
-syn region  calendarCppOut2	contained start='0' end='^\s*#\s*\%(endif\|else\|elif\)\>' contains=calendarSpaceError,calendarCppSkip
+                                  \ contains=calendarCppOut2
-syn region  calendarCppSkip	contained start='^\s*#\s*\%(if\|ifdef\|ifndef\)\>' skip='\\$' end='^\s*#\s*endif\>' contains=calendarSpaceError,calendarCppSkip
+syn region  calendarCppOut2       contained start='0'
-syn region  calendarIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+                                  \ end='^\s*#\s*\%(endif\|else\|elif\)\>'
+                                  \ contains=calendarSpaceError,calendarCppSkip
+syn region  calendarCppSkip       contained
+                                  \ start='^\s*#\s*\%(if\|ifdef\|ifndef\)\>'
+                                  \ skip='\\$' end='^\s*#\s*endif\>'
+                                  \ contains=calendarSpaceError,calendarCppSkip
+syn region  calendarIncluded      display contained start=+"+ skip=+\\\\\|\\"+
+                                  \ end=+"+
 syn match   calendarIncluded      display contained '<[^>]*>'
-syn match   calendarInclude	display '^\s*#\s*include\>\s*["<]' contains=calendarIncluded
+syn match   calendarInclude       display '^\s*#\s*include\>\s*["<]'
-syn cluster calendarPreProcGroup    contains=calendarPreCondit,calendarIncluded,calendarInclude,calendarDefine,calendarCppOut,calendarCppOut2,calendarCppSkip,calendarString,calendarSpecial,calendarTodo
+                                  \ contains=calendarIncluded
-syn region  calendarDefine	start='^\s*#\s*\%(define\|undef\)\>' skip='\\$' end='$' contains=ALLBUT,@calendarPreProcGroup
+syn cluster calendarPreProcGroup  contains=calendarPreCondit,calendarIncluded,
-syn region  calendarPreProc	start='^\s*#\s*\%(pragma\|line\|warning\|warn\|error\)\>' skip='\\$' end='$' keepend contains=ALLBUT,@calendarPreProcGroup
+                                  \ calendarInclude,calendarDefine,
+                                  \ calendarCppOut,calendarCppOut2,
+                                  \ calendarCppSkip,calendarString,
+                                  \ calendarSpecial,calendarTodo
+syn region  calendarDefine        start='^\s*#\s*\%(define\|undef\)\>'
+                                  \ skip='\\$' end='$'
+                                  \ contains=ALLBUT,@calendarPreProcGroup
+syn region  calendarPreProc       start='^\s*#\s*\%(pragma\|line\|warning\|warn\|error\)\>'
+                                  \ skip='\\$' end='$' keepend
+                                  \ contains=ALLBUT,@calendarPreProcGroup
 
-" Keywords
 syn keyword calendarKeyword       CHARSET BODUN LANG
 syn case ignore
 syn keyword calendarKeyword       Easter Pashka
 syn case match
 
-" Dates
 syn case ignore
-syn match   calendarNumber	'\<\d\+\>'
+syn match   calendarNumber        display '\<\d\+\>'
-syn keyword calendarMonth	Jan[uary] Feb[ruary] Mar[ch] Apr[il] May Jun[e]
+syn keyword calendarMonth         Jan[uary] Feb[ruary] Mar[ch] Apr[il] May
-syn keyword calendarMonth	Jul[y] Aug[ust] Sep[tember] Oct[ober]
+                                  \ Jun[e] Jul[y] Aug[ust] Sep[tember]
-syn keyword calendarMonth	Nov[ember] Dec[ember]
+                                  \ Oct[ober] Nov[ember] Dec[ember]
-syn match   calendarMonth	'\<\%(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\)\.'
+syn match   calendarMonth         display '\<\%(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\)\.'
 syn keyword calendarWeekday       Mon[day] Tue[sday] Wed[nesday] Thu[rsday]
 syn keyword calendarWeekday       Fri[day] Sat[urday] Sun[day]
-syn match   calendarWeekday	'\<\%(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun\)\.' nextgroup=calendarWeekdayMod
+syn match   calendarWeekday       display '\<\%(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun\)\.'
-syn match   calendarWeekdayMod	'[+-]\d\+\>'
+                                  \ nextgroup=calendarWeekdayMod
+syn match   calendarWeekdayMod    display '[+-]\d\+\>'
 syn case match
 
-" Times
+syn match   calendarTime          display '\<\%([01]\=\d\|2[0-3]\):[0-5]\d\%(:[0-5]\d\)\='
-syn match   calendarTime	'\<\%([01]\=\d\|2[0-3]\):[0-5]\d\%(:[0-5]\d\)\='
+syn match   calendarTime          display '\<\%(0\=[1-9]\|1[0-2]\):[0-5]\d\%(:[0-5]\d\)\=\s*[AaPp][Mm]'
-syn match   calendarTime	'\<\%(0\=[1-9]\|1[0-2]\):[0-5]\d\%(:[0-5]\d\)\=\s*[AaPp][Mm]'
 
-" Variables
 syn match calendarVariable        '\*'
 
-let b:c_minlines = 50		" #if 0 constructs can be long
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
+else
+  if !exists("c_no_if0")
+    let b:c_minlines = 50       " #if 0 constructs can be long
+  else
+    let b:c_minlines = 15       " mostly for () constructs
+  endif
+endif
 exec "syn sync ccomment calendarComment minlines=" . b:c_minlines
 
-" Define the default highlighting.
+hi def link calendarTodo          Todo
-" For version 5.7 and earlier: only when not done already
+hi def link calendarComment       Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link calendarCppString     String
-if version >= 508 || !exists("did_calendar_syn_inits")
+hi def link calendarSpecial       SpecialChar
-  if version < 508
+hi def link calendarPreCondit     PreCondit
-    let did_calendar_syn_inits = 1
+hi def link calendarCppOut        Comment
-    command -nargs=+ HiLink hi link <args>
+hi def link calendarCppOut2       calendarCppOut
-  else
+hi def link calendarCppSkip       calendarCppOut
-    command -nargs=+ HiLink hi def link <args>
+hi def link calendarIncluded      String
-  endif
+hi def link calendarInclude       Include
-
+hi def link calendarDefine        Macro
-  HiLink calendarTodo		Todo
+hi def link calendarPreProc       PreProc
-  HiLink calendarComment	Comment
+hi def link calendarKeyword       Keyword
-  HiLink calendarCppString	String
+hi def link calendarNumber        Number
-  HiLink calendarSpecial	SpecialChar
+hi def link calendarMonth         String
-  HiLink calendarPreCondit	PreCondit
+hi def link calendarWeekday       String
-  HiLink calendarCppOut	Comment
+hi def link calendarWeekdayMod    Special
-  HiLink calendarCppOut2	calendarCppOut
+hi def link calendarTime          Number
-  HiLink calendarCppSkip	calendarCppOut
+hi def link calendarVariable      Identifier
-  HiLink calendarIncluded	String
-  HiLink calendarInclude	Include
-  HiLink calendarDefine	Macro
-  HiLink calendarPreProc	PreProc
-  HiLink calendarKeyword	Keyword
-  HiLink calendarNumber	Number
-  HiLink calendarMonth	String
-  HiLink calendarWeekday	String
-  HiLink calendarWeekdayMod	Special
-  HiLink calendarTime		Number
-  HiLink calendarVariable	Identifier
-
-  delcommand HiLink
-endif
 
 let b:current_syntax = "calendar"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/context.vim

@@ -0,0 +1,104 @@
+" Vim syntax file
+" Language:         ConTeXt typesetting engine
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword contextTodo       TODO FIXME XXX NOTE
+
+syn region  contextComment    display oneline matchgroup=contextComment
+                              \ start='%' end='$' contains=contextTodo
+syn region  contextComment    display oneline matchgroup=contextComment
+                              \ start='^\s*%[CDM]' end='$' contains=ALL
+
+syn match   contextStatement  display '\\[a-zA-Z@]\+' contains=@NoSpell
+
+syn match   contextBlockDelim display '\\\%(start\|stop\)\a\+'
+                              \ contains=@NoSpell
+
+syn match   contextDelimiter  '[][{}]'
+
+syn match   contextEscaped    display '\\\_[\{}|&%$ ]'
+syn region  contextEscaped    display matchgroup=contextPreProc
+                              \ start='\\type\z(\A\)' end='\z1'
+syn region  contextEscaped    display matchgroup=contextPreProc
+                              \ start='\\type\={' end='}'
+syn region  contextEscaped    display matchgroup=contextPreProc
+                              \ start='\\type\=<<' end='>>'
+syn region  contextEscaped    matchgroup=contextPreProc
+                              \ start='\\start\z(\a*\%(typing\|typen\)\)'
+                              \ end='\\stop\z1'
+syn region  contextEscaped    display matchgroup=contextPreProc
+                              \ start='\\\h\+Type{' end='}'
+syn region  contextEscaped    display matchgroup=contextPreProc
+                              \ start='\\Typed\h\+{' end='}'
+
+"syn region  contextMath       matchgroup=contextMath start='\$' end='\$'
+"                              \ contains=contextStatement
+
+syn match   contextBuiltin    '\\\%(newif\|def\|gdef\|global\|let\|glet\|bgroup\)\>'
+                              \ contains=@NoSpell
+syn match   contextBuiltin    '\\\%(begingroup\|egroup\|endgroup\|long\|catcode\)\>'
+                              \ contains=@NoSpell
+syn match   contextBuiltin    '\\\%(unprotect\|unexpanded\|if\|else\|fi\|ifx\)\>'
+                              \ contains=@NoSpell
+syn match   contextBuiltin    '\\\%(futurelet\|protect\)\>' contains=@NoSpell
+syn match   contextBuiltin    '\\\%([lr]q\)\>' contains=@NoSpell
+
+syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\).*$'
+                              \ contains=@NoSpell
+syn match   contextPreProc    '^\s*\\input\s\+.*$' contains=@NoSpell
+
+syn match   contextSectioning '\\chapter\>' contains=@NoSpell
+syn match   contextSectioning '\\\%(sub\)*section\>' contains=@NoSpell
+
+syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
+                              \ contains=@NoSpell
+syn match   contextSpecial    '\\[`'"]'
+syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
+                              \ contains=@NoSpell
+syn match   contextSpecial    '\^\^.'
+syn match   contextSpecial    '`\%(\\.\|\^\^.\|.\)'
+
+syn match   contextStyle      '\\\%(em\|tt\|rm\|ss\|hw\|cg\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(tf[abcdx]\|bfx\|[is]lx\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(b[fsi]\|s[cl]\|it\|os\|mf\)\>'
+                              \ contains=@NoSpell
+
+syn match   contextDimension  '[+-]\=\s*\%(\d\+\%([.,]\d*\)\=\|[.,]\d\+\)\s*\%(true\)\=\s*\%(p[tc]\|in\|bp\|c[mc]\|mm\|dd\|sp\|e[mx]\)\>'
+                              \ contains=@NoSpell
+
+hi def link contextTodo       Todo
+hi def link contextComment    Comment
+hi def link contextEscaped    Special
+hi def link contextStatement  Identifier
+hi def link contextMath       String
+hi def link contextBlockDelim Keyword
+hi def link contextBuiltin    Keyword
+hi def link contextDelimiter  Delimiter
+hi def link contextPreProc    PreProc
+hi def link contextSectioning PreProc
+hi def link contextSpecial    Special
+hi def link contextStyle      contextType
+hi def link contextFont       contextType
+hi def link contextType       Type
+hi def link contextDimension  Number
+
+let b:current_syntax = "context"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/crm.vim

@@ -1,61 +1,42 @@
 " Vim syntax file
 " Language:         CRM114
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/crm/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-22
-" arch-tag:	    a3d3eaaf-4700-44ff-b332-f6c42c036883
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Todo
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword crmTodo       contained TODO FIXME XXX NOTE
 
-" Comments
+syn region  crmComment    matchgroup=crmComment start='#' end='$' end='\\#'
-syn region  crmComment	    matchgroup=crmComment start='#' end='$' end='\\#' contains=crmTodo
+                          \ contains=crmTodo,@Spell
 
-" Variables
+syn match   crmVariable   display ':[*#@]:[^:]\{-1,}:'
-syn match   crmVariable    ':[*#@]:[^:]\{-1,}:'
 
-" Special Characters
+syn match   crmSpecial    display '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'
-syn match   crmSpecial	    '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'
 
-" Statements
 syn keyword crmStatement  insert noop accept alius alter classify eval exit
 syn keyword crmStatement  fail fault goto hash intersect isolate input learn
 syn keyword crmStatement  liaf match output syscall trap union window
 
-" Regexes
+syn region  crmRegex      matchgroup=crmRegex start='/' skip='\\/' end='/'
-syn region   crmRegex	    matchgroup=crmRegex start='/' skip='\\/' end='/' contains=crmVariable
+                          \ contains=crmVariable
 
-" Labels
+syn match   crmLabel      display '^\s*:[[:graph:]]\+:'
-syn match   crmLabel	    '^\s*:[[:graph:]]\+:'
 
-" Define the default highlighting.
+hi def link crmTodo       Todo
-" For version 5.7 and earlier: only when not done already
+hi def link crmComment    Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link crmVariable   Identifier
-if version >= 508 || !exists("did_crm_syn_inits")
+hi def link crmSpecial    SpecialChar
-  if version < 508
+hi def link crmStatement  Statement
-    let did_crm_syn_inits = 1
+hi def link crmRegex      String
-    command -nargs=+ HiLink hi link <args>
+hi def link crmLabel      Label
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink crmTodo	Todo
-  HiLink crmComment	Comment
-  HiLink crmVariable	Identifier
-  HiLink crmSpecial	SpecialChar
-  HiLink crmStatement	Statement
-  HiLink crmRegex	String
-  HiLink crmLabel	Label
-
-  delcommand HiLink
-endif
 
 let b:current_syntax = "crm"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/cvsrc.vim

@@ -1,49 +1,39 @@
 " Vim syntax file
-" Language:	    CVS RC File
+" Language:         cvs(1) RC file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/syntax/pcp/cvsrc/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-06
-" arch-tag:	    1910f2a8-66f4-4dde-9d1a-297566934535
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" strings
+let s:cpo_save = &cpo
-syn region  cvsrcString	    start=+"+ skip=+\\\\\|\\\\"+ end=+"\|$+
+set cpo&vim
-syn region  cvsrcString	    start=+'+ skip=+\\\\\|\\\\'+ end=+'\|$+
 
-" numbers
+syn region  cvsrcString   display start=+"+ skip=+\\\\\|\\\\"+ end=+"\|$+
-syn match   cvsrcNumber	    "\<\d\+\>"
+syn region  cvsrcString   display start=+'+ skip=+\\\\\|\\\\'+ end=+'\|$+
 
-" commands
+syn match   cvsrcNumber   display '\<\d\+\>'
-syn match   cvsrcBegin	    "^" nextgroup=cvsrcCommand skipwhite
 
-syn region  cvsrcCommand    contained transparent matchgroup=cvsrcCommand start="add\|admin\|checkout\|commit\|cvs\|diff\|export\|history\|import\|init\|log\|rdiff\|release\|remove\|rtag\|status\|tag\|update" end="$" contains=cvsrcOption,cvsrcString,cvsrcNumber keepend
+syn match   cvsrcBegin    display '^' nextgroup=cvsrcCommand skipwhite
 
-" options
+syn region  cvsrcCommand  contained transparent matchgroup=cvsrcCommand
-syn match   cvsrcOption	    "-\a\+"
+                          \ start='add\|admin\|checkout\|commit\|cvs\|diff'
+                          \ start='export\|history\|import\|init\|log'
+                          \ start='rdiff\|release\|remove\|rtag\|status\|tag'
+                          \ start='update'
+                          \ end='$'
+                          \ contains=cvsrcOption,cvsrcString,cvsrcNumber
+                          \ keepend
 
-" Define the default highlighting.
+syn match   cvsrcOption   contained display '-\a\+'
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cvsrc_syn_inits")
-  if version < 508
-    let did_cvsrc_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
 
-  HiLink cvsrcString	String
+hi def link cvsrcString   String
-  HiLink cvsrcNumber	Number
+hi def link cvsrcNumber   Number
-  HiLink cvsrcCommand	Keyword
+hi def link cvsrcCommand  Keyword
-  HiLink cvsrcOption	Identifier
+hi def link cvsrcOption   Identifier
-  delcommand HiLink
-endif
 
 let b:current_syntax = "cvsrc"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/dircolors.vim

@@ -1,106 +1,746 @@
 " Vim syntax file
 " Language:         dircolors(1) input file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/dircolors/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-22
-" arch-tag:	    995e2983-2a7a-4f1e-b00d-3fdf8e076b40
-" Color definition coloring implemented my Mikolaj Machowski <mikmach@wp.pl>
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" todo
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword dircolorsTodo       contained FIXME TODO XXX NOTE
 
-" comments
+syn region  dircolorsComment    start='#' end='$' contains=dircolorsTodo,@Spell
-syn region  dircolorsComment	start="#" end="$" contains=dircolorsTodo
 
-" numbers
+syn keyword dircolorsKeyword    TERM LEFT LEFTCODE RIGHT RIGHTCODE END ENDCODE
-syn match   dircolorsNumber	"\<\d\+\>"
+
+syn keyword dircolorsKeyword    NORMAL NORM FILE DIR LNK LINK SYMLINK ORPHAN
+                                \ MISSING FIFO PIPE SOCK BLK BLOCK CHR CHAR
+                                \ DOOR EXEC
+                                \ nextgroup=@dircolorsColors skipwhite
 
-" keywords
-syn keyword dircolorsKeyword	TERM NORMAL NORM FILE DIR LNK LINK SYMLINK
-syn keyword dircolorsKeyword	ORPHAN MISSING FIFO PIPE SOCK BLK BLOCK CHR
-syn keyword dircolorsKeyword	CHAR DOOR EXEC LEFT LEFTCODE RIGHT RIGHTCODE
-syn keyword dircolorsKeyword	END ENDCODE
 if exists("dircolors_is_slackware")
   syn keyword dircolorsKeyword  COLOR OPTIONS EIGHTBIT
 endif
 
-" extensions
+syn match   dircolorsExtension  '^\s*\zs[.*]\S\+'
-syn match   dircolorsExtension	"^\s*\zs[.*]\S\+"
+                                \ nextgroup=@dircolorsColors skipwhite
 
-" colors
+if &t_Co == 8 || &t_Co == 16
-syn match dircolors01 "\<01\>"
+  syn cluster dircolorsColors   contains=dircolorsBold,dircolorsUnderline,
-syn match dircolors04 "\<04\>"
+                                \ dircolorsBlink,dircolorsReverse,
-syn match dircolors05 "\<05\>"
+                                \ dircolorsInvisible,dircolorsBlack,
-syn match dircolors07 "\<07\>"
+                                \ dircolorsRed,dircolorsGreen,dircolorsYellow,
-syn match dircolors08 "\<08\>"
+                                \ dircolorsBlue,dircolorsMagenta,dircolorsCyan,
-syn match dircolors30 "\<30\>"
+                                \ dircolorsWhite,dircolorsBGBlack,
-syn match dircolors31 "\<31\>"
+                                \ dircolorsBGRed,dircolorsBGGreen,
-syn match dircolors32 "\<32\>"
+                                \ dircolorsBGYellow,dircolorsBGBlue,
-syn match dircolors33 "\<33\>"
+                                \ dircolorsBGMagenta,dircolorsBGCyan,
-syn match dircolors34 "\<34\>"
+                                \ dircolorsBGWhite
-syn match dircolors35 "\<35\>"
-syn match dircolors36 "\<36\>"
-syn match dircolors37 "\<37\>"
-syn match dircolors40 "\<40\>"
-syn match dircolors41 "\<41\>"
-syn match dircolors42 "\<42\>"
-syn match dircolors43 "\<43\>"
-syn match dircolors44 "\<44\>"
-syn match dircolors45 "\<45\>"
-syn match dircolors46 "\<46\>"
-syn match dircolors47 "\<47\>"
 
-" Define the default highlighting.
+  syn match dircolorsBold       contained '\<01\>'
-" For version 5.7 and earlier: only when not done already
+  syn match dircolorsUnderline  contained '\<04\>'
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+  syn match dircolorsBlink      contained '\<05\>'
-if version >= 508 || !exists("did_dircolors_syn_inits")
+  syn match dircolorsReverse    contained '\<07\>'
-  if version < 508
+  syn match dircolorsInvisible  contained '\<08\>'
-    let did_dircolors_syn_inits = 1
+  syn match dircolorsBlack      contained '\<30\>'
-    command -nargs=+ HiLink hi link <args>
+  syn match dircolorsRed        contained '\<31\>'
-    command -nargs=+ HiDef hi <args>
+  syn match dircolorsGreen      contained '\<32\>'
-  else
+  syn match dircolorsYellow     contained '\<33\>'
-    command -nargs=+ HiLink hi def link <args>
+  syn match dircolorsBlue       contained '\<34\>'
-    command -nargs=+ HiDef hi def <args>
+  syn match dircolorsMagenta    contained '\<35\>'
-  endif
+  syn match dircolorsCyan       contained '\<36\>'
+  syn match dircolorsWhite      contained '\<37\>'
+  syn match dircolorsBGBlack    contained '\<40\>'
+  syn match dircolorsBGRed      contained '\<41\>'
+  syn match dircolorsBGGreen    contained '\<42\>'
+  syn match dircolorsBGYellow   contained '\<43\>'
+  syn match dircolorsBGBlue     contained '\<44\>'
+  syn match dircolorsBGMagenta  contained '\<45\>'
+  syn match dircolorsBGCyan     contained '\<46\>'
+  syn match dircolorsBGWhite    contained '\<47\>'
+elseif &t_Co == 256
+  syn cluster dircolorsColors   contains=dircolorsColor1,dircolorsColor2,
+                                \ dircolorsColor3,dircolorsColor4,
+                                \ dircolorsColor5,dircolorsColor6,
+                                \ dircolorsColor7,dircolorsColor8,
+                                \ dircolorsColor9,dircolorsColor10,
+                                \ dircolorsColor11,dircolorsColor12,
+                                \ dircolorsColor13,dircolorsColor14,
+                                \ dircolorsColor15,dircolorsColor16,
+                                \ dircolorsColor17,dircolorsColor18,
+                                \ dircolorsColor19,dircolorsColor20,
+                                \ dircolorsColor21,dircolorsColor22,
+                                \ dircolorsColor23,dircolorsColor24,
+                                \ dircolorsColor25,dircolorsColor26,
+                                \ dircolorsColor27,dircolorsColor28,
+                                \ dircolorsColor29,dircolorsColor30,
+                                \ dircolorsColor31,dircolorsColor32,
+                                \ dircolorsColor33,dircolorsColor34,
+                                \ dircolorsColor35,dircolorsColor36,
+                                \ dircolorsColor37,dircolorsColor38,
+                                \ dircolorsColor39,dircolorsColor40,
+                                \ dircolorsColor41,dircolorsColor42,
+                                \ dircolorsColor43,dircolorsColor44,
+                                \ dircolorsColor45,dircolorsColor46,
+                                \ dircolorsColor47,dircolorsColor48,
+                                \ dircolorsColor49,dircolorsColor50,
+                                \ dircolorsColor51,dircolorsColor52,
+                                \ dircolorsColor53,dircolorsColor54,
+                                \ dircolorsColor55,dircolorsColor56,
+                                \ dircolorsColor57,dircolorsColor58,
+                                \ dircolorsColor59,dircolorsColor60,
+                                \ dircolorsColor61,dircolorsColor62,
+                                \ dircolorsColor63,dircolorsColor64,
+                                \ dircolorsColor65,dircolorsColor66,
+                                \ dircolorsColor67,dircolorsColor68,
+                                \ dircolorsColor69,dircolorsColor70,
+                                \ dircolorsColor71,dircolorsColor72,
+                                \ dircolorsColor73,dircolorsColor74,
+                                \ dircolorsColor75,dircolorsColor76,
+                                \ dircolorsColor77,dircolorsColor78,
+                                \ dircolorsColor79,dircolorsColor80,
+                                \ dircolorsColor81,dircolorsColor82,
+                                \ dircolorsColor83,dircolorsColor84,
+                                \ dircolorsColor85,dircolorsColor86,
+                                \ dircolorsColor87,dircolorsColor88,
+                                \ dircolorsColor89,dircolorsColor90,
+                                \ dircolorsColor91,dircolorsColor92,
+                                \ dircolorsColor93,dircolorsColor94,
+                                \ dircolorsColor95,dircolorsColor96,
+                                \ dircolorsColor97,dircolorsColor98,
+                                \ dircolorsColor99,dircolorsColor100,
+                                \ dircolorsColor101,dircolorsColor102,
+                                \ dircolorsColor103,dircolorsColor104,
+                                \ dircolorsColor105,dircolorsColor106,
+                                \ dircolorsColor107,dircolorsColor108,
+                                \ dircolorsColor109,dircolorsColor110,
+                                \ dircolorsColor111,dircolorsColor112,
+                                \ dircolorsColor113,dircolorsColor114,
+                                \ dircolorsColor115,dircolorsColor116,
+                                \ dircolorsColor117,dircolorsColor118,
+                                \ dircolorsColor119,dircolorsColor120,
+                                \ dircolorsColor121,dircolorsColor122,
+                                \ dircolorsColor123,dircolorsColor124,
+                                \ dircolorsColor125,dircolorsColor126,
+                                \ dircolorsColor127,dircolorsColor128,
+                                \ dircolorsColor129,dircolorsColor130,
+                                \ dircolorsColor131,dircolorsColor132,
+                                \ dircolorsColor133,dircolorsColor134,
+                                \ dircolorsColor135,dircolorsColor136,
+                                \ dircolorsColor137,dircolorsColor138,
+                                \ dircolorsColor139,dircolorsColor140,
+                                \ dircolorsColor141,dircolorsColor142,
+                                \ dircolorsColor143,dircolorsColor144,
+                                \ dircolorsColor145,dircolorsColor146,
+                                \ dircolorsColor147,dircolorsColor148,
+                                \ dircolorsColor149,dircolorsColor150,
+                                \ dircolorsColor151,dircolorsColor152,
+                                \ dircolorsColor153,dircolorsColor154,
+                                \ dircolorsColor155,dircolorsColor156,
+                                \ dircolorsColor157,dircolorsColor158,
+                                \ dircolorsColor159,dircolorsColor160,
+                                \ dircolorsColor161,dircolorsColor162,
+                                \ dircolorsColor163,dircolorsColor164,
+                                \ dircolorsColor165,dircolorsColor166,
+                                \ dircolorsColor167,dircolorsColor168,
+                                \ dircolorsColor169,dircolorsColor170,
+                                \ dircolorsColor171,dircolorsColor172,
+                                \ dircolorsColor173,dircolorsColor174,
+                                \ dircolorsColor175,dircolorsColor176,
+                                \ dircolorsColor177,dircolorsColor178,
+                                \ dircolorsColor179,dircolorsColor180,
+                                \ dircolorsColor181,dircolorsColor182,
+                                \ dircolorsColor183,dircolorsColor184,
+                                \ dircolorsColor185,dircolorsColor186,
+                                \ dircolorsColor187,dircolorsColor188,
+                                \ dircolorsColor189,dircolorsColor190,
+                                \ dircolorsColor191,dircolorsColor192,
+                                \ dircolorsColor193,dircolorsColor194,
+                                \ dircolorsColor195,dircolorsColor196,
+                                \ dircolorsColor197,dircolorsColor198,
+                                \ dircolorsColor199,dircolorsColor200,
+                                \ dircolorsColor201,dircolorsColor202,
+                                \ dircolorsColor203,dircolorsColor204,
+                                \ dircolorsColor205,dircolorsColor206,
+                                \ dircolorsColor207,dircolorsColor208,
+                                \ dircolorsColor209,dircolorsColor210,
+                                \ dircolorsColor211,dircolorsColor212,
+                                \ dircolorsColor213,dircolorsColor214,
+                                \ dircolorsColor215,dircolorsColor216,
+                                \ dircolorsColor217,dircolorsColor218,
+                                \ dircolorsColor219,dircolorsColor220,
+                                \ dircolorsColor221,dircolorsColor222,
+                                \ dircolorsColor223,dircolorsColor224,
+                                \ dircolorsColor225,dircolorsColor226,
+                                \ dircolorsColor227,dircolorsColor228,
+                                \ dircolorsColor229,dircolorsColor230,
+                                \ dircolorsColor231,dircolorsColor232,
+                                \ dircolorsColor233,dircolorsColor234,
+                                \ dircolorsColor235,dircolorsColor236,
+                                \ dircolorsColor237,dircolorsColor238,
+                                \ dircolorsColor239,dircolorsColor240,
+                                \ dircolorsColor241,dircolorsColor242,
+                                \ dircolorsColor243,dircolorsColor244,
+                                \ dircolorsColor245,dircolorsColor246,
+                                \ dircolorsColor247,dircolorsColor248,
+                                \ dircolorsColor249,dircolorsColor250,
+                                \ dircolorsColor251,dircolorsColor252,
+                                \ dircolorsColor253,dircolorsColor254,
+                                \ dircolorsColor255
 
-  HiLink dircolorsTodo	Todo
+  syn match dircolorsColor1     contained '\<1\>'
-  HiLink dircolorsComment	Comment
+  syn match dircolorsColor2     contained '\<2\>'
-  HiLink dircolorsNumber	Number
+  syn match dircolorsColor3     contained '\<3\>'
-  HiLink dircolorsKeyword	Keyword
+  syn match dircolorsColor4     contained '\<4\>'
-  HiLink dircolorsExtension	Keyword
+  syn match dircolorsColor5     contained '\<5\>'
+  syn match dircolorsColor6     contained '\<6\>'
+  syn match dircolorsColor7     contained '\<7\>'
+  syn match dircolorsColor8     contained '\<8\>'
+  syn match dircolorsColor9     contained '\<9\>'
+  syn match dircolorsColor10    contained '\<10\>'
+  syn match dircolorsColor11    contained '\<11\>'
+  syn match dircolorsColor12    contained '\<12\>'
+  syn match dircolorsColor13    contained '\<13\>'
+  syn match dircolorsColor14    contained '\<14\>'
+  syn match dircolorsColor15    contained '\<15\>'
+  syn match dircolorsColor16    contained '\<16\>'
+  syn match dircolorsColor17    contained '\<17\>'
+  syn match dircolorsColor18    contained '\<18\>'
+  syn match dircolorsColor19    contained '\<19\>'
+  syn match dircolorsColor20    contained '\<20\>'
+  syn match dircolorsColor21    contained '\<21\>'
+  syn match dircolorsColor22    contained '\<22\>'
+  syn match dircolorsColor23    contained '\<23\>'
+  syn match dircolorsColor24    contained '\<24\>'
+  syn match dircolorsColor25    contained '\<25\>'
+  syn match dircolorsColor26    contained '\<26\>'
+  syn match dircolorsColor27    contained '\<27\>'
+  syn match dircolorsColor28    contained '\<28\>'
+  syn match dircolorsColor29    contained '\<29\>'
+  syn match dircolorsColor30    contained '\<30\>'
+  syn match dircolorsColor31    contained '\<31\>'
+  syn match dircolorsColor32    contained '\<32\>'
+  syn match dircolorsColor33    contained '\<33\>'
+  syn match dircolorsColor34    contained '\<34\>'
+  syn match dircolorsColor35    contained '\<35\>'
+  syn match dircolorsColor36    contained '\<36\>'
+  syn match dircolorsColor37    contained '\<37\>'
+  syn match dircolorsColor38    contained '\<38\>'
+  syn match dircolorsColor39    contained '\<39\>'
+  syn match dircolorsColor40    contained '\<40\>'
+  syn match dircolorsColor41    contained '\<41\>'
+  syn match dircolorsColor42    contained '\<42\>'
+  syn match dircolorsColor43    contained '\<43\>'
+  syn match dircolorsColor44    contained '\<44\>'
+  syn match dircolorsColor45    contained '\<45\>'
+  syn match dircolorsColor46    contained '\<46\>'
+  syn match dircolorsColor47    contained '\<47\>'
+  syn match dircolorsColor48    contained '\<48\>'
+  syn match dircolorsColor49    contained '\<49\>'
+  syn match dircolorsColor50    contained '\<50\>'
+  syn match dircolorsColor51    contained '\<51\>'
+  syn match dircolorsColor52    contained '\<52\>'
+  syn match dircolorsColor53    contained '\<53\>'
+  syn match dircolorsColor54    contained '\<54\>'
+  syn match dircolorsColor55    contained '\<55\>'
+  syn match dircolorsColor56    contained '\<56\>'
+  syn match dircolorsColor57    contained '\<57\>'
+  syn match dircolorsColor58    contained '\<58\>'
+  syn match dircolorsColor59    contained '\<59\>'
+  syn match dircolorsColor60    contained '\<60\>'
+  syn match dircolorsColor61    contained '\<61\>'
+  syn match dircolorsColor62    contained '\<62\>'
+  syn match dircolorsColor63    contained '\<63\>'
+  syn match dircolorsColor64    contained '\<64\>'
+  syn match dircolorsColor65    contained '\<65\>'
+  syn match dircolorsColor66    contained '\<66\>'
+  syn match dircolorsColor67    contained '\<67\>'
+  syn match dircolorsColor68    contained '\<68\>'
+  syn match dircolorsColor69    contained '\<69\>'
+  syn match dircolorsColor70    contained '\<70\>'
+  syn match dircolorsColor71    contained '\<71\>'
+  syn match dircolorsColor72    contained '\<72\>'
+  syn match dircolorsColor73    contained '\<73\>'
+  syn match dircolorsColor74    contained '\<74\>'
+  syn match dircolorsColor75    contained '\<75\>'
+  syn match dircolorsColor76    contained '\<76\>'
+  syn match dircolorsColor77    contained '\<77\>'
+  syn match dircolorsColor78    contained '\<78\>'
+  syn match dircolorsColor79    contained '\<79\>'
+  syn match dircolorsColor80    contained '\<80\>'
+  syn match dircolorsColor81    contained '\<81\>'
+  syn match dircolorsColor82    contained '\<82\>'
+  syn match dircolorsColor83    contained '\<83\>'
+  syn match dircolorsColor84    contained '\<84\>'
+  syn match dircolorsColor85    contained '\<85\>'
+  syn match dircolorsColor86    contained '\<86\>'
+  syn match dircolorsColor87    contained '\<87\>'
+  syn match dircolorsColor88    contained '\<88\>'
+  syn match dircolorsColor89    contained '\<89\>'
+  syn match dircolorsColor90    contained '\<90\>'
+  syn match dircolorsColor91    contained '\<91\>'
+  syn match dircolorsColor92    contained '\<92\>'
+  syn match dircolorsColor93    contained '\<93\>'
+  syn match dircolorsColor94    contained '\<94\>'
+  syn match dircolorsColor95    contained '\<95\>'
+  syn match dircolorsColor96    contained '\<96\>'
+  syn match dircolorsColor97    contained '\<97\>'
+  syn match dircolorsColor98    contained '\<98\>'
+  syn match dircolorsColor99    contained '\<99\>'
+  syn match dircolorsColor100   contained '\<100\>'
+  syn match dircolorsColor101   contained '\<101\>'
+  syn match dircolorsColor102   contained '\<102\>'
+  syn match dircolorsColor103   contained '\<103\>'
+  syn match dircolorsColor104   contained '\<104\>'
+  syn match dircolorsColor105   contained '\<105\>'
+  syn match dircolorsColor106   contained '\<106\>'
+  syn match dircolorsColor107   contained '\<107\>'
+  syn match dircolorsColor108   contained '\<108\>'
+  syn match dircolorsColor109   contained '\<109\>'
+  syn match dircolorsColor110   contained '\<110\>'
+  syn match dircolorsColor111   contained '\<111\>'
+  syn match dircolorsColor112   contained '\<112\>'
+  syn match dircolorsColor113   contained '\<113\>'
+  syn match dircolorsColor114   contained '\<114\>'
+  syn match dircolorsColor115   contained '\<115\>'
+  syn match dircolorsColor116   contained '\<116\>'
+  syn match dircolorsColor117   contained '\<117\>'
+  syn match dircolorsColor118   contained '\<118\>'
+  syn match dircolorsColor119   contained '\<119\>'
+  syn match dircolorsColor120   contained '\<120\>'
+  syn match dircolorsColor121   contained '\<121\>'
+  syn match dircolorsColor122   contained '\<122\>'
+  syn match dircolorsColor123   contained '\<123\>'
+  syn match dircolorsColor124   contained '\<124\>'
+  syn match dircolorsColor125   contained '\<125\>'
+  syn match dircolorsColor126   contained '\<126\>'
+  syn match dircolorsColor127   contained '\<127\>'
+  syn match dircolorsColor128   contained '\<128\>'
+  syn match dircolorsColor129   contained '\<129\>'
+  syn match dircolorsColor130   contained '\<130\>'
+  syn match dircolorsColor131   contained '\<131\>'
+  syn match dircolorsColor132   contained '\<132\>'
+  syn match dircolorsColor133   contained '\<133\>'
+  syn match dircolorsColor134   contained '\<134\>'
+  syn match dircolorsColor135   contained '\<135\>'
+  syn match dircolorsColor136   contained '\<136\>'
+  syn match dircolorsColor137   contained '\<137\>'
+  syn match dircolorsColor138   contained '\<138\>'
+  syn match dircolorsColor139   contained '\<139\>'
+  syn match dircolorsColor140   contained '\<140\>'
+  syn match dircolorsColor141   contained '\<141\>'
+  syn match dircolorsColor142   contained '\<142\>'
+  syn match dircolorsColor143   contained '\<143\>'
+  syn match dircolorsColor144   contained '\<144\>'
+  syn match dircolorsColor145   contained '\<145\>'
+  syn match dircolorsColor146   contained '\<146\>'
+  syn match dircolorsColor147   contained '\<147\>'
+  syn match dircolorsColor148   contained '\<148\>'
+  syn match dircolorsColor149   contained '\<149\>'
+  syn match dircolorsColor150   contained '\<150\>'
+  syn match dircolorsColor151   contained '\<151\>'
+  syn match dircolorsColor152   contained '\<152\>'
+  syn match dircolorsColor153   contained '\<153\>'
+  syn match dircolorsColor154   contained '\<154\>'
+  syn match dircolorsColor155   contained '\<155\>'
+  syn match dircolorsColor156   contained '\<156\>'
+  syn match dircolorsColor157   contained '\<157\>'
+  syn match dircolorsColor158   contained '\<158\>'
+  syn match dircolorsColor159   contained '\<159\>'
+  syn match dircolorsColor160   contained '\<160\>'
+  syn match dircolorsColor161   contained '\<161\>'
+  syn match dircolorsColor162   contained '\<162\>'
+  syn match dircolorsColor163   contained '\<163\>'
+  syn match dircolorsColor164   contained '\<164\>'
+  syn match dircolorsColor165   contained '\<165\>'
+  syn match dircolorsColor166   contained '\<166\>'
+  syn match dircolorsColor167   contained '\<167\>'
+  syn match dircolorsColor168   contained '\<168\>'
+  syn match dircolorsColor169   contained '\<169\>'
+  syn match dircolorsColor170   contained '\<170\>'
+  syn match dircolorsColor171   contained '\<171\>'
+  syn match dircolorsColor172   contained '\<172\>'
+  syn match dircolorsColor173   contained '\<173\>'
+  syn match dircolorsColor174   contained '\<174\>'
+  syn match dircolorsColor175   contained '\<175\>'
+  syn match dircolorsColor176   contained '\<176\>'
+  syn match dircolorsColor177   contained '\<177\>'
+  syn match dircolorsColor178   contained '\<178\>'
+  syn match dircolorsColor179   contained '\<179\>'
+  syn match dircolorsColor180   contained '\<180\>'
+  syn match dircolorsColor181   contained '\<181\>'
+  syn match dircolorsColor182   contained '\<182\>'
+  syn match dircolorsColor183   contained '\<183\>'
+  syn match dircolorsColor184   contained '\<184\>'
+  syn match dircolorsColor185   contained '\<185\>'
+  syn match dircolorsColor186   contained '\<186\>'
+  syn match dircolorsColor187   contained '\<187\>'
+  syn match dircolorsColor188   contained '\<188\>'
+  syn match dircolorsColor189   contained '\<189\>'
+  syn match dircolorsColor190   contained '\<190\>'
+  syn match dircolorsColor191   contained '\<191\>'
+  syn match dircolorsColor192   contained '\<192\>'
+  syn match dircolorsColor193   contained '\<193\>'
+  syn match dircolorsColor194   contained '\<194\>'
+  syn match dircolorsColor195   contained '\<195\>'
+  syn match dircolorsColor196   contained '\<196\>'
+  syn match dircolorsColor197   contained '\<197\>'
+  syn match dircolorsColor198   contained '\<198\>'
+  syn match dircolorsColor199   contained '\<199\>'
+  syn match dircolorsColor200   contained '\<200\>'
+  syn match dircolorsColor201   contained '\<201\>'
+  syn match dircolorsColor202   contained '\<202\>'
+  syn match dircolorsColor203   contained '\<203\>'
+  syn match dircolorsColor204   contained '\<204\>'
+  syn match dircolorsColor205   contained '\<205\>'
+  syn match dircolorsColor206   contained '\<206\>'
+  syn match dircolorsColor207   contained '\<207\>'
+  syn match dircolorsColor208   contained '\<208\>'
+  syn match dircolorsColor209   contained '\<209\>'
+  syn match dircolorsColor210   contained '\<210\>'
+  syn match dircolorsColor211   contained '\<211\>'
+  syn match dircolorsColor212   contained '\<212\>'
+  syn match dircolorsColor213   contained '\<213\>'
+  syn match dircolorsColor214   contained '\<214\>'
+  syn match dircolorsColor215   contained '\<215\>'
+  syn match dircolorsColor216   contained '\<216\>'
+  syn match dircolorsColor217   contained '\<217\>'
+  syn match dircolorsColor218   contained '\<218\>'
+  syn match dircolorsColor219   contained '\<219\>'
+  syn match dircolorsColor220   contained '\<220\>'
+  syn match dircolorsColor221   contained '\<221\>'
+  syn match dircolorsColor222   contained '\<222\>'
+  syn match dircolorsColor223   contained '\<223\>'
+  syn match dircolorsColor224   contained '\<224\>'
+  syn match dircolorsColor225   contained '\<225\>'
+  syn match dircolorsColor226   contained '\<226\>'
+  syn match dircolorsColor227   contained '\<227\>'
+  syn match dircolorsColor228   contained '\<228\>'
+  syn match dircolorsColor229   contained '\<229\>'
+  syn match dircolorsColor230   contained '\<230\>'
+  syn match dircolorsColor231   contained '\<231\>'
+  syn match dircolorsColor232   contained '\<232\>'
+  syn match dircolorsColor233   contained '\<233\>'
+  syn match dircolorsColor234   contained '\<234\>'
+  syn match dircolorsColor235   contained '\<235\>'
+  syn match dircolorsColor236   contained '\<236\>'
+  syn match dircolorsColor237   contained '\<237\>'
+  syn match dircolorsColor238   contained '\<238\>'
+  syn match dircolorsColor239   contained '\<239\>'
+  syn match dircolorsColor240   contained '\<240\>'
+  syn match dircolorsColor241   contained '\<241\>'
+  syn match dircolorsColor242   contained '\<242\>'
+  syn match dircolorsColor243   contained '\<243\>'
+  syn match dircolorsColor244   contained '\<244\>'
+  syn match dircolorsColor245   contained '\<245\>'
+  syn match dircolorsColor246   contained '\<246\>'
+  syn match dircolorsColor247   contained '\<247\>'
+  syn match dircolorsColor248   contained '\<248\>'
+  syn match dircolorsColor249   contained '\<249\>'
+  syn match dircolorsColor250   contained '\<250\>'
+  syn match dircolorsColor251   contained '\<251\>'
+  syn match dircolorsColor252   contained '\<252\>'
+  syn match dircolorsColor253   contained '\<253\>'
+  syn match dircolorsColor254   contained '\<254\>'
+  syn match dircolorsColor255   contained '\<255\>'
+else
+  syn cluster dircolorsColors   contains=dircolorsNumber
+  syn match   dircolorsNumber   '\<\d\+\>'
+endif
 
-  HiDef dircolors01		term=bold cterm=bold gui=bold
+hi def link dircolorsTodo       Todo
-  HiDef dircolors04		term=underline cterm=underline gui=underline
+hi def link dircolorsComment    Comment
-  "    HiDef dircolors05
+hi def link dircolorsKeyword    Keyword
-  HiDef dircolors07		term=reverse cterm=reverse gui=reverse
+hi def link dircolorsExtension  Keyword
-  HiLink dircolors08		Ignore
-  HiDef dircolors30		ctermfg=Black guifg=Black
-  HiDef dircolors31		ctermfg=Red guifg=Red
-  HiDef dircolors32		ctermfg=Green guifg=Green
-  HiDef dircolors33		ctermfg=Yellow guifg=Yellow
-  HiDef dircolors34		ctermfg=Blue guifg=Blue
-  HiDef dircolors35		ctermfg=Magenta guifg=Magenta
-  HiDef dircolors36		ctermfg=Cyan guifg=Cyan
-  HiDef dircolors37		ctermfg=White guifg=White
-  HiDef dircolors40		ctermbg=Black ctermfg=White guibg=Black guifg=White
-  HiDef dircolors41		ctermbg=DarkRed guibg=DarkRed
-  HiDef dircolors42		ctermbg=DarkGreen guibg=DarkGreen
-  HiDef dircolors43		ctermbg=DarkYellow guibg=DarkYellow
-  HiDef dircolors44		ctermbg=DarkBlue guibg=DarkBlue
-  HiDef dircolors45		ctermbg=DarkMagenta guibg=DarkMagenta
-  HiDef dircolors46		ctermbg=DarkCyan guibg=DarkCyan
-  HiDef dircolors47		ctermbg=White ctermfg=Black guibg=White guifg=Black
 
-  delcommand HiLink
+if &t_Co == 8 || &t_Co == 16
-  delcommand HiDef
+  hi def      dircolorsBold       term=bold cterm=bold gui=bold
+  hi def      dircolorsUnderline  term=underline cterm=underline gui=underline
+  hi def link dircolorsBlink      Normal
+  hi def      dircolorsReverse    term=reverse cterm=reverse gui=reverse
+  hi def link dircolorsInvisible  Ignore
+  hi def      dircolorsBlack      ctermfg=Black guifg=Black
+  hi def      dircolorsRed        ctermfg=Red guifg=Red
+  hi def      dircolorsGreen      ctermfg=Green guifg=Green
+  hi def      dircolorsYellow     ctermfg=Yellow guifg=Yellow
+  hi def      dircolorsBlue       ctermfg=Blue guifg=Blue
+  hi def      dircolorsMagenta    ctermfg=Magenta guifg=Magenta
+  hi def      dircolorsCyan       ctermfg=Cyan guifg=Cyan
+  hi def      dircolorsWhite      ctermfg=White guifg=White
+  hi def      dircolorsBGBlack    ctermbg=Black ctermfg=White
+                                  \ guibg=Black guifg=White
+  hi def      dircolorsBGRed      ctermbg=DarkRed guibg=DarkRed
+  hi def      dircolorsBGGreen    ctermbg=DarkGreen guibg=DarkGreen
+  hi def      dircolorsBGYellow   ctermbg=DarkYellow guibg=DarkYellow
+  hi def      dircolorsBGBlue     ctermbg=DarkBlue guibg=DarkBlue
+  hi def      dircolorsBGMagenta  ctermbg=DarkMagenta guibg=DarkMagenta
+  hi def      dircolorsBGCyan     ctermbg=DarkCyan guibg=DarkCyan
+  hi def      dircolorsBGWhite    ctermbg=White ctermfg=Black
+                                  \ guibg=White guifg=Black
+elseif &t_Co == 256
+  hi def    dircolorsColor1     ctermfg=1   guifg=1
+  hi def    dircolorsColor2     ctermfg=2   guifg=2
+  hi def    dircolorsColor3     ctermfg=3   guifg=3
+  hi def    dircolorsColor4     ctermfg=4   guifg=4
+  hi def    dircolorsColor5     ctermfg=5   guifg=5
+  hi def    dircolorsColor6     ctermfg=6   guifg=6
+  hi def    dircolorsColor7     ctermfg=7   guifg=7
+  hi def    dircolorsColor8     ctermfg=8   guifg=8
+  hi def    dircolorsColor9     ctermfg=9   guifg=9
+  hi def    dircolorsColor10    ctermfg=10  guifg=10
+  hi def    dircolorsColor11    ctermfg=11  guifg=11
+  hi def    dircolorsColor12    ctermfg=12  guifg=12
+  hi def    dircolorsColor13    ctermfg=13  guifg=13
+  hi def    dircolorsColor14    ctermfg=14  guifg=14
+  hi def    dircolorsColor15    ctermfg=15  guifg=15
+  hi def    dircolorsColor16    ctermfg=16  guifg=16
+  hi def    dircolorsColor17    ctermfg=17  guifg=17
+  hi def    dircolorsColor18    ctermfg=18  guifg=18
+  hi def    dircolorsColor19    ctermfg=19  guifg=19
+  hi def    dircolorsColor20    ctermfg=20  guifg=20
+  hi def    dircolorsColor21    ctermfg=21  guifg=21
+  hi def    dircolorsColor22    ctermfg=22  guifg=22
+  hi def    dircolorsColor23    ctermfg=23  guifg=23
+  hi def    dircolorsColor24    ctermfg=24  guifg=24
+  hi def    dircolorsColor25    ctermfg=25  guifg=25
+  hi def    dircolorsColor26    ctermfg=26  guifg=26
+  hi def    dircolorsColor27    ctermfg=27  guifg=27
+  hi def    dircolorsColor28    ctermfg=28  guifg=28
+  hi def    dircolorsColor29    ctermfg=29  guifg=29
+  hi def    dircolorsColor30    ctermfg=30  guifg=30
+  hi def    dircolorsColor31    ctermfg=31  guifg=31
+  hi def    dircolorsColor32    ctermfg=32  guifg=32
+  hi def    dircolorsColor33    ctermfg=33  guifg=33
+  hi def    dircolorsColor34    ctermfg=34  guifg=34
+  hi def    dircolorsColor35    ctermfg=35  guifg=35
+  hi def    dircolorsColor36    ctermfg=36  guifg=36
+  hi def    dircolorsColor37    ctermfg=37  guifg=37
+  hi def    dircolorsColor38    ctermfg=38  guifg=38
+  hi def    dircolorsColor39    ctermfg=39  guifg=39
+  hi def    dircolorsColor40    ctermfg=40  guifg=40
+  hi def    dircolorsColor41    ctermfg=41  guifg=41
+  hi def    dircolorsColor42    ctermfg=42  guifg=42
+  hi def    dircolorsColor43    ctermfg=43  guifg=43
+  hi def    dircolorsColor44    ctermfg=44  guifg=44
+  hi def    dircolorsColor45    ctermfg=45  guifg=45
+  hi def    dircolorsColor46    ctermfg=46  guifg=46
+  hi def    dircolorsColor47    ctermfg=47  guifg=47
+  hi def    dircolorsColor48    ctermfg=48  guifg=48
+  hi def    dircolorsColor49    ctermfg=49  guifg=49
+  hi def    dircolorsColor50    ctermfg=50  guifg=50
+  hi def    dircolorsColor51    ctermfg=51  guifg=51
+  hi def    dircolorsColor52    ctermfg=52  guifg=52
+  hi def    dircolorsColor53    ctermfg=53  guifg=53
+  hi def    dircolorsColor54    ctermfg=54  guifg=54
+  hi def    dircolorsColor55    ctermfg=55  guifg=55
+  hi def    dircolorsColor56    ctermfg=56  guifg=56
+  hi def    dircolorsColor57    ctermfg=57  guifg=57
+  hi def    dircolorsColor58    ctermfg=58  guifg=58
+  hi def    dircolorsColor59    ctermfg=59  guifg=59
+  hi def    dircolorsColor60    ctermfg=60  guifg=60
+  hi def    dircolorsColor61    ctermfg=61  guifg=61
+  hi def    dircolorsColor62    ctermfg=62  guifg=62
+  hi def    dircolorsColor63    ctermfg=63  guifg=63
+  hi def    dircolorsColor64    ctermfg=64  guifg=64
+  hi def    dircolorsColor65    ctermfg=65  guifg=65
+  hi def    dircolorsColor66    ctermfg=66  guifg=66
+  hi def    dircolorsColor67    ctermfg=67  guifg=67
+  hi def    dircolorsColor68    ctermfg=68  guifg=68
+  hi def    dircolorsColor69    ctermfg=69  guifg=69
+  hi def    dircolorsColor70    ctermfg=70  guifg=70
+  hi def    dircolorsColor71    ctermfg=71  guifg=71
+  hi def    dircolorsColor72    ctermfg=72  guifg=72
+  hi def    dircolorsColor73    ctermfg=73  guifg=73
+  hi def    dircolorsColor74    ctermfg=74  guifg=74
+  hi def    dircolorsColor75    ctermfg=75  guifg=75
+  hi def    dircolorsColor76    ctermfg=76  guifg=76
+  hi def    dircolorsColor77    ctermfg=77  guifg=77
+  hi def    dircolorsColor78    ctermfg=78  guifg=78
+  hi def    dircolorsColor79    ctermfg=79  guifg=79
+  hi def    dircolorsColor80    ctermfg=80  guifg=80
+  hi def    dircolorsColor81    ctermfg=81  guifg=81
+  hi def    dircolorsColor82    ctermfg=82  guifg=82
+  hi def    dircolorsColor83    ctermfg=83  guifg=83
+  hi def    dircolorsColor84    ctermfg=84  guifg=84
+  hi def    dircolorsColor85    ctermfg=85  guifg=85
+  hi def    dircolorsColor86    ctermfg=86  guifg=86
+  hi def    dircolorsColor87    ctermfg=87  guifg=87
+  hi def    dircolorsColor88    ctermfg=88  guifg=88
+  hi def    dircolorsColor89    ctermfg=89  guifg=89
+  hi def    dircolorsColor90    ctermfg=90  guifg=90
+  hi def    dircolorsColor91    ctermfg=91  guifg=91
+  hi def    dircolorsColor92    ctermfg=92  guifg=92
+  hi def    dircolorsColor93    ctermfg=93  guifg=93
+  hi def    dircolorsColor94    ctermfg=94  guifg=94
+  hi def    dircolorsColor95    ctermfg=95  guifg=95
+  hi def    dircolorsColor96    ctermfg=96  guifg=96
+  hi def    dircolorsColor97    ctermfg=97  guifg=97
+  hi def    dircolorsColor98    ctermfg=98  guifg=98
+  hi def    dircolorsColor99    ctermfg=99  guifg=99
+  hi def    dircolorsColor100   ctermfg=100 guifg=100
+  hi def    dircolorsColor101   ctermfg=101 guifg=101
+  hi def    dircolorsColor102   ctermfg=102 guifg=102
+  hi def    dircolorsColor103   ctermfg=103 guifg=103
+  hi def    dircolorsColor104   ctermfg=104 guifg=104
+  hi def    dircolorsColor105   ctermfg=105 guifg=105
+  hi def    dircolorsColor106   ctermfg=106 guifg=106
+  hi def    dircolorsColor107   ctermfg=107 guifg=107
+  hi def    dircolorsColor108   ctermfg=108 guifg=108
+  hi def    dircolorsColor109   ctermfg=109 guifg=109
+  hi def    dircolorsColor110   ctermfg=110 guifg=110
+  hi def    dircolorsColor111   ctermfg=111 guifg=111
+  hi def    dircolorsColor112   ctermfg=112 guifg=112
+  hi def    dircolorsColor113   ctermfg=113 guifg=113
+  hi def    dircolorsColor114   ctermfg=114 guifg=114
+  hi def    dircolorsColor115   ctermfg=115 guifg=115
+  hi def    dircolorsColor116   ctermfg=116 guifg=116
+  hi def    dircolorsColor117   ctermfg=117 guifg=117
+  hi def    dircolorsColor118   ctermfg=118 guifg=118
+  hi def    dircolorsColor119   ctermfg=119 guifg=119
+  hi def    dircolorsColor120   ctermfg=120 guifg=120
+  hi def    dircolorsColor121   ctermfg=121 guifg=121
+  hi def    dircolorsColor122   ctermfg=122 guifg=122
+  hi def    dircolorsColor123   ctermfg=123 guifg=123
+  hi def    dircolorsColor124   ctermfg=124 guifg=124
+  hi def    dircolorsColor125   ctermfg=125 guifg=125
+  hi def    dircolorsColor126   ctermfg=126 guifg=126
+  hi def    dircolorsColor127   ctermfg=127 guifg=127
+  hi def    dircolorsColor128   ctermfg=128 guifg=128
+  hi def    dircolorsColor129   ctermfg=129 guifg=129
+  hi def    dircolorsColor130   ctermfg=130 guifg=130
+  hi def    dircolorsColor131   ctermfg=131 guifg=131
+  hi def    dircolorsColor132   ctermfg=132 guifg=132
+  hi def    dircolorsColor133   ctermfg=133 guifg=133
+  hi def    dircolorsColor134   ctermfg=134 guifg=134
+  hi def    dircolorsColor135   ctermfg=135 guifg=135
+  hi def    dircolorsColor136   ctermfg=136 guifg=136
+  hi def    dircolorsColor137   ctermfg=137 guifg=137
+  hi def    dircolorsColor138   ctermfg=138 guifg=138
+  hi def    dircolorsColor139   ctermfg=139 guifg=139
+  hi def    dircolorsColor140   ctermfg=140 guifg=140
+  hi def    dircolorsColor141   ctermfg=141 guifg=141
+  hi def    dircolorsColor142   ctermfg=142 guifg=142
+  hi def    dircolorsColor143   ctermfg=143 guifg=143
+  hi def    dircolorsColor144   ctermfg=144 guifg=144
+  hi def    dircolorsColor145   ctermfg=145 guifg=145
+  hi def    dircolorsColor146   ctermfg=146 guifg=146
+  hi def    dircolorsColor147   ctermfg=147 guifg=147
+  hi def    dircolorsColor148   ctermfg=148 guifg=148
+  hi def    dircolorsColor149   ctermfg=149 guifg=149
+  hi def    dircolorsColor150   ctermfg=150 guifg=150
+  hi def    dircolorsColor151   ctermfg=151 guifg=151
+  hi def    dircolorsColor152   ctermfg=152 guifg=152
+  hi def    dircolorsColor153   ctermfg=153 guifg=153
+  hi def    dircolorsColor154   ctermfg=154 guifg=154
+  hi def    dircolorsColor155   ctermfg=155 guifg=155
+  hi def    dircolorsColor156   ctermfg=156 guifg=156
+  hi def    dircolorsColor157   ctermfg=157 guifg=157
+  hi def    dircolorsColor158   ctermfg=158 guifg=158
+  hi def    dircolorsColor159   ctermfg=159 guifg=159
+  hi def    dircolorsColor160   ctermfg=160 guifg=160
+  hi def    dircolorsColor161   ctermfg=161 guifg=161
+  hi def    dircolorsColor162   ctermfg=162 guifg=162
+  hi def    dircolorsColor163   ctermfg=163 guifg=163
+  hi def    dircolorsColor164   ctermfg=164 guifg=164
+  hi def    dircolorsColor165   ctermfg=165 guifg=165
+  hi def    dircolorsColor166   ctermfg=166 guifg=166
+  hi def    dircolorsColor167   ctermfg=167 guifg=167
+  hi def    dircolorsColor168   ctermfg=168 guifg=168
+  hi def    dircolorsColor169   ctermfg=169 guifg=169
+  hi def    dircolorsColor170   ctermfg=170 guifg=170
+  hi def    dircolorsColor171   ctermfg=171 guifg=171
+  hi def    dircolorsColor172   ctermfg=172 guifg=172
+  hi def    dircolorsColor173   ctermfg=173 guifg=173
+  hi def    dircolorsColor174   ctermfg=174 guifg=174
+  hi def    dircolorsColor175   ctermfg=175 guifg=175
+  hi def    dircolorsColor176   ctermfg=176 guifg=176
+  hi def    dircolorsColor177   ctermfg=177 guifg=177
+  hi def    dircolorsColor178   ctermfg=178 guifg=178
+  hi def    dircolorsColor179   ctermfg=179 guifg=179
+  hi def    dircolorsColor180   ctermfg=180 guifg=180
+  hi def    dircolorsColor181   ctermfg=181 guifg=181
+  hi def    dircolorsColor182   ctermfg=182 guifg=182
+  hi def    dircolorsColor183   ctermfg=183 guifg=183
+  hi def    dircolorsColor184   ctermfg=184 guifg=184
+  hi def    dircolorsColor185   ctermfg=185 guifg=185
+  hi def    dircolorsColor186   ctermfg=186 guifg=186
+  hi def    dircolorsColor187   ctermfg=187 guifg=187
+  hi def    dircolorsColor188   ctermfg=188 guifg=188
+  hi def    dircolorsColor189   ctermfg=189 guifg=189
+  hi def    dircolorsColor190   ctermfg=190 guifg=190
+  hi def    dircolorsColor191   ctermfg=191 guifg=191
+  hi def    dircolorsColor192   ctermfg=192 guifg=192
+  hi def    dircolorsColor193   ctermfg=193 guifg=193
+  hi def    dircolorsColor194   ctermfg=194 guifg=194
+  hi def    dircolorsColor195   ctermfg=195 guifg=195
+  hi def    dircolorsColor196   ctermfg=196 guifg=196
+  hi def    dircolorsColor197   ctermfg=197 guifg=197
+  hi def    dircolorsColor198   ctermfg=198 guifg=198
+  hi def    dircolorsColor199   ctermfg=199 guifg=199
+  hi def    dircolorsColor200   ctermfg=200 guifg=200
+  hi def    dircolorsColor201   ctermfg=201 guifg=201
+  hi def    dircolorsColor202   ctermfg=202 guifg=202
+  hi def    dircolorsColor203   ctermfg=203 guifg=203
+  hi def    dircolorsColor204   ctermfg=204 guifg=204
+  hi def    dircolorsColor205   ctermfg=205 guifg=205
+  hi def    dircolorsColor206   ctermfg=206 guifg=206
+  hi def    dircolorsColor207   ctermfg=207 guifg=207
+  hi def    dircolorsColor208   ctermfg=208 guifg=208
+  hi def    dircolorsColor209   ctermfg=209 guifg=209
+  hi def    dircolorsColor210   ctermfg=210 guifg=210
+  hi def    dircolorsColor211   ctermfg=211 guifg=211
+  hi def    dircolorsColor212   ctermfg=212 guifg=212
+  hi def    dircolorsColor213   ctermfg=213 guifg=213
+  hi def    dircolorsColor214   ctermfg=214 guifg=214
+  hi def    dircolorsColor215   ctermfg=215 guifg=215
+  hi def    dircolorsColor216   ctermfg=216 guifg=216
+  hi def    dircolorsColor217   ctermfg=217 guifg=217
+  hi def    dircolorsColor218   ctermfg=218 guifg=218
+  hi def    dircolorsColor219   ctermfg=219 guifg=219
+  hi def    dircolorsColor220   ctermfg=220 guifg=220
+  hi def    dircolorsColor221   ctermfg=221 guifg=221
+  hi def    dircolorsColor222   ctermfg=222 guifg=222
+  hi def    dircolorsColor223   ctermfg=223 guifg=223
+  hi def    dircolorsColor224   ctermfg=224 guifg=224
+  hi def    dircolorsColor225   ctermfg=225 guifg=225
+  hi def    dircolorsColor226   ctermfg=226 guifg=226
+  hi def    dircolorsColor227   ctermfg=227 guifg=227
+  hi def    dircolorsColor228   ctermfg=228 guifg=228
+  hi def    dircolorsColor229   ctermfg=229 guifg=229
+  hi def    dircolorsColor230   ctermfg=230 guifg=230
+  hi def    dircolorsColor231   ctermfg=231 guifg=231
+  hi def    dircolorsColor232   ctermfg=232 guifg=232
+  hi def    dircolorsColor233   ctermfg=233 guifg=233
+  hi def    dircolorsColor234   ctermfg=234 guifg=234
+  hi def    dircolorsColor235   ctermfg=235 guifg=235
+  hi def    dircolorsColor236   ctermfg=236 guifg=236
+  hi def    dircolorsColor237   ctermfg=237 guifg=237
+  hi def    dircolorsColor238   ctermfg=238 guifg=238
+  hi def    dircolorsColor239   ctermfg=239 guifg=239
+  hi def    dircolorsColor240   ctermfg=240 guifg=240
+  hi def    dircolorsColor241   ctermfg=241 guifg=241
+  hi def    dircolorsColor242   ctermfg=242 guifg=242
+  hi def    dircolorsColor243   ctermfg=243 guifg=243
+  hi def    dircolorsColor244   ctermfg=244 guifg=244
+  hi def    dircolorsColor245   ctermfg=245 guifg=245
+  hi def    dircolorsColor246   ctermfg=246 guifg=246
+  hi def    dircolorsColor247   ctermfg=247 guifg=247
+  hi def    dircolorsColor248   ctermfg=248 guifg=248
+  hi def    dircolorsColor249   ctermfg=249 guifg=249
+  hi def    dircolorsColor250   ctermfg=250 guifg=250
+  hi def    dircolorsColor251   ctermfg=251 guifg=251
+  hi def    dircolorsColor252   ctermfg=252 guifg=252
+  hi def    dircolorsColor253   ctermfg=253 guifg=253
+  hi def    dircolorsColor254   ctermfg=254 guifg=254
+  hi def    dircolorsColor255   ctermfg=255 guifg=255
+else
+  hi def link dircolorsNumber     Number
 endif
 
 let b:current_syntax = "dircolors"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/elinks.vim

@@ -1,54 +1,40 @@
 " Vim syntax file
 " Language:         elinks(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-22
-" arch-tag:	    74eaff55-cdb5-4d31-805b-9627eb6535f1
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
+let s:cpo_save = &cpo
-" For version 5.x: Set it globally
+set cpo&vim
-" For version 6.x: Set it locally
+
-if version >= 600
+setlocal iskeyword=@,48-57,_,-
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk @,48-57,_,-
-delcommand SetIsk
 
-" Todo
 syn keyword elinksTodo      contained TODO FIXME XXX NOTE
 
-" Comments
+syn region  elinksComment   matchgroup=elinksComment start='#' end='$'
-syn region  elinksComment   matchgroup=elinksComment start='#' end='$' contains=elinksTodo
+                            \ contains=elinksTodo
 
-" Numbers
 syn match   elinksNumber    '\<\d\+\>'
 
-" Strings
+syn region  elinksString    matchgroup=elinksString start=+"+
-syn region  elinksString    matchgroup=elinksString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@elinksColor
+                            \ skip=+\\\\\|\\"+ end=+"+ contains=@elinksColor
 
-" Keywords
 syn keyword elinksKeyword   set bind
 
-" Options
 syn keyword elinksPrefix    bookmarks
 syn keyword elinksOptions   file_format
 
 syn keyword elinksPrefix    config
 syn keyword elinksOptions   comments indentation saving_style i18n
-syn keyword elinksOptions   saving_style_w show_template
+                            \ saving_style_w show_template
 
 syn keyword elinksPrefix    connection ssl client_cert
 syn keyword elinksOptions   enable file cert_verify async_dns max_connections
-syn keyword elinksOptions   max_connections_to_host receive_timeout retries
+                            \ max_connections_to_host receive_timeout retries
-syn keyword elinksOptions   unrestartable_receive_timeout
+                            \ unrestartable_receive_timeout
 
 syn keyword elinksPrefix    cookies
 syn keyword elinksOptions   accept_policy max_age paranoid_security save resave
@@ -58,150 +44,145 @@ syn keyword elinksPrefix    active_link colors search cache codepage colors
 syn keyword elinksPrefix    format memory download dump history global html
 syn keyword elinksPrefix    plain
 syn keyword elinksOptions   auto_follow priority auto_submit confirm_submit
-syn keyword elinksOptions   input_size show_formhist file_tags
+                            \ input_size show_formhist file_tags
-syn keyword elinksOptions   image_link_tagging image_link_prefix
+                            \ image_link_tagging image_link_prefix
-syn keyword elinksOptions   image_link_suffix show_as_links show_any_as_links
+                            \ image_link_suffix show_as_links
-syn keyword elinksOptions   background text enable_color bold invert underline
+                            \ show_any_as_links background text enable_color
-syn keyword elinksOptions   color_dirs numbering use_tabindex
+                            \ bold invert underline color_dirs numbering
-syn keyword elinksOptions   number_keys_select_link wraparound case regex
+                            \ use_tabindex number_keys_select_link
-syn keyword elinksOptions   show_hit_top_bottom wraparound show_not_found
+                            \ wraparound case regex show_hit_top_bottom
-syn keyword elinksOptions   margin_width refresh minimum_refresh_time
+                            \ wraparound show_not_found margin_width refresh
-syn keyword elinksOptions   scroll_margin scroll_step table_move_order size
+                            \ minimum_refresh_time scroll_margin scroll_step
-syn keyword elinksOptions   size cache_redirects ignore_cache_control assume
+                            \ table_move_order size size cache_redirects
-syn keyword elinksOptions   force_assumed text background link vlink dirs
+                            \ ignore_cache_control assume force_assumed text
-syn keyword elinksOptions   allow_dark_on_black ensure_contrast
+                            \ background link vlink dirs allow_dark_on_black
-syn keyword elinksOptions   use_document_colors directory set_original_time
+                            \ ensure_contrast use_document_colors directory
-syn keyword elinksOptions   overwrite notify_bell codepage width enable
+                            \ set_original_time overwrite notify_bell
-syn keyword elinksOptions   max_items display_type write_interval
+                            \ codepage width enable max_items display_type
-syn keyword elinksOptions   keep_unhistory display_frames display_tables
+                            \ write_interval keep_unhistory display_frames
-syn keyword elinksOptions   expand_table_columns display_subs display_sups
+                            \ display_tables expand_table_columns display_subs
-syn keyword elinksOptions   link_display underline_links wrap_nbsp
+                            \ display_sups link_display underline_links
-syn keyword elinksOptions   display_links compress_empty_lines
+                            \ wrap_nbsp display_links compress_empty_lines
 
 syn keyword elinksPrefix    mime extension handler mailcap mimetypes type
 syn keyword elinksOptions   ask block program enable path ask description
-syn keyword elinksOptions   prioritize enable path default_type
+                            \ prioritize enable path default_type
 
 syn keyword elinksPrefix    protocol file cgi ftp proxy http bugs proxy
 syn keyword elinksPrefix    referer https proxy rewrite dumb smart
 syn keyword elinksOptions   path policy allow_special_files show_hidden_files
-syn keyword elinksOptions   try_encoding_extensions host anon_passwd use_pasv
+                            \ try_encoding_extensions host anon_passwd
-syn keyword elinksOptions   use_epsv accept_charset allow_blacklist
+                            \ use_pasv use_epsv accept_charset allow_blacklist
-syn keyword elinksOptions   broken_302_redirect post_no_keepalive http10 host
+                            \ broken_302_redirect post_no_keepalive http10
-syn keyword elinksOptions   user passwd policy fake accept_language
+                            \ host user passwd policy fake accept_language
-syn keyword elinksOptions   accept_ui_language trace user_agent host
+                            \ accept_ui_language trace user_agent host
-syn keyword elinksOptions   enable-dumb enable-smart
+                            \ enable-dumb enable-smart
 
 syn keyword elinksPrefix    terminal
 syn keyword elinksOptions   type m11_hack utf_8_io restrict_852 block_cursor
-syn keyword elinksOptions   colors transparency underline charset
+                            \ colors transparency underline charset
 
 syn keyword elinksPrefix    ui colors color mainmenu normal selected hotkey
-syn keyword elinksPrefix    menu marked hotkey frame dialog generic frame
+                            \ menu marked hotkey frame dialog generic
-syn keyword elinksPrefix    scrollbar scrollbar-selected title text checkbox
+                            \ frame scrollbar scrollbar-selected title text
-syn keyword elinksPrefix    checkbox-label button button-selected field
+                            \ checkbox checkbox-label button button-selected
-syn keyword elinksPrefix    field-text meter shadow title title-bar title-text
+                            \ field field-text meter shadow title title-bar
-syn keyword elinksPrefix    status status-bar status-text tabs unvisited normal
+                            \ title-text status status-bar status-text tabs
-syn keyword elinksPrefix    loading separator searched mono
+                            \ unvisited normal loading separator searched mono
 syn keyword elinksOptions   text background
 
 syn keyword elinksPrefix    ui dialogs leds sessions tabs timer
 syn keyword elinksOptions   listbox_min_height shadows underline_hotkeys enable
-syn keyword elinksOptions   auto_save auto_restore auto_save_foldername
+                            \ auto_save auto_restore auto_save_foldername
-syn keyword elinksOptions   homepage show_bar wraparound confirm_close enable
+                            \ homepage show_bar wraparound confirm_close
-syn keyword elinksOptions   duration action language show_status_bar
+                            \ enable duration action language show_status_bar
-syn keyword elinksOptions   show_title_bar startup_goto_dialog success_msgbox
+                            \ show_title_bar startup_goto_dialog
-syn keyword elinksOptions   window_title
+                            \ success_msgbox window_title
 
 syn keyword elinksOptions   secure_file_saving
 
-" Colors
+syn cluster elinksColor     contains=elinksColorBlack,elinksColorDarkRed,
-syn cluster elinksColor contains=elinksColorBlack,elinksColorDarkRed,elinksColorDarkGreen,elinksColorDarkYellow,elinksColorDarkBlue,elinksColorDarkMagenta,elinksColorDarkCyan,elinksColorGray,elinksColorDarkGray,elinksColorRed,elinksColorGreen,elinksColorYellow,elinksColorBlue,elinksColorMagenta,elinksColorCyan,elinksColorWhite
+                            \ elinksColorDarkGreen,elinksColorDarkYellow,
+                            \ elinksColorDarkBlue,elinksColorDarkMagenta,
+                            \ elinksColorDarkCyan,elinksColorGray,
+                            \ elinksColorDarkGray,elinksColorRed,
+                            \ elinksColorGreen,elinksColorYellow,
+                            \ elinksColorBlue,elinksColorMagenta,
+                            \ elinksColorCyan,elinksColorWhite
 
-syn keyword elinksColorBlack	    black contained
+syn keyword elinksColorBlack        contained black
-syn keyword elinksColorDarkRed	    darkred sandybrown maroon crimson firebrick contained
+syn keyword elinksColorDarkRed      contained darkred sandybrown maroon crimson
-syn keyword elinksColorDarkGreen    darkgreen darkolivegreen darkseagreen contained
+                                    \ firebrick
-syn keyword elinksColorDarkGreen    forestgreen mediumspringgreen seagreen contained
+syn keyword elinksColorDarkGreen    contained darkgreen darkolivegreen
-syn keyword elinksColorDarkYellow   brown blanchedalmond chocolate darkorange contained
+                                    \ darkseagreen forestgreen
-syn keyword elinksColorDarkYellow   darkgoldenrod orange rosybrown saddlebrown contained
+                                    \ mediumspringgreen seagreen
-syn keyword elinksColorDarkYellow   peru olive olivedrab sienna contained
+syn keyword elinksColorDarkYellow   contained brown blanchedalmond chocolate
-syn keyword elinksColorDarkBlue	    darkblue cadetblue cornflowerblue contained
+                                    \ darkorange darkgoldenrod orange rosybrown
-syn keyword elinksColorDarkBlue	    darkslateblue deepskyblue midnightblue contained
+                                    \ saddlebrown peru olive olivedrab sienna
-syn keyword elinksColorDarkBlue	    royalblue steelblue navy contained
+syn keyword elinksColorDarkBlue     contained darkblue cadetblue cornflowerblue
-syn keyword elinksColorDarkMagenta  darkmagenta mediumorchid mediumpurple contained
+                                    \ darkslateblue deepskyblue midnightblue
-syn keyword elinksColorDarkMagenta  mediumslateblue slateblue deeppink hotpink contained
+                                    \ royalblue steelblue navy
-syn keyword elinksColorDarkMagenta  darkorchid orchid purple indigo contained
+syn keyword elinksColorDarkMagenta  contained darkmagenta mediumorchid
-syn keyword elinksColorDarkCyan	    darkcyan mediumaquamarine mediumturquoise contained
+                                    \ mediumpurple mediumslateblue slateblue
-syn keyword elinksColorDarkCyan	    darkturquoise teal contained
+                                    \ deeppink hotpink darkorchid orchid purple
-syn keyword elinksColorGray	    silver dimgray lightslategray slategray contained
+                                    \ indigo
-syn keyword elinksColorGray	    lightgrey burlywood plum tan thistle contained
+syn keyword elinksColorDarkCyan     contained darkcyan mediumaquamarine
+                                    \ mediumturquoise darkturquoise teal
+syn keyword elinksColorGray         contained silver dimgray lightslategray
+                                    \ slategray lightgrey burlywood plum tan
+                                    \ thistle
+syn keyword elinksColorDarkGray     contained gray darkgray darkslategray
+                                    \ darksalmon
+syn keyword elinksColorRed          contained red indianred orangered tomato
+                                    \ lightsalmon salmon coral lightcoral
+syn keyword elinksColorGreen        contained green greenyellow lawngreen
+                                    \ lightgreen lightseagreen limegreen
+                                    \ mediumseagreen springgreen yellowgreen
+                                    \ palegreen lime chartreuse
+syn keyword elinksColorYellow       contained yellow beige darkkhaki
+                                    \ lightgoldenrodyellow palegoldenrod gold
+                                    \ goldenrod khaki lightyellow
+syn keyword elinksColorBlue         contained blue aliceblue aqua aquamarine
+                                    \ azure dodgerblue lightblue lightskyblue
+                                    \ lightsteelblue mediumblue
+syn keyword elinksColorMagenta      contained magenta darkviolet blueviolet
+                                    \ lightpink mediumvioletred palevioletred
+                                    \ violet pink fuchsia
+syn keyword elinksColorCyan         contained cyan lightcyan powderblue skyblue
+                                    \ turquoise paleturquoise
+syn keyword elinksColorWhite        contained white antiquewhite floralwhite
+                                    \ ghostwhite navajowhite whitesmoke linen
+                                    \ lemonchiffon cornsilk lavender
+                                    \ lavenderblush seashell mistyrose ivory
+                                    \ papayawhip bisque gainsboro honeydew
+                                    \ mintcream moccasin oldlace peachpuff snow
+                                    \ wheat
 
-syn keyword elinksColorDarkGray	    gray darkgray darkslategray darksalmon contained
+hi def link elinksTodo              Todo
-syn keyword elinksColorRed	    red indianred orangered tomato lightsalmon contained
+hi def link elinksComment           Comment
-syn keyword elinksColorRed	    salmon coral lightcoral contained
+hi def link elinksNumber            Number
-syn keyword elinksColorGreen	    green greenyellow lawngreen lightgreen contained
+hi def link elinksString            String
-syn keyword elinksColorGreen	    lightseagreen limegreen mediumseagreen contained
+hi def link elinksKeyword           Keyword
-syn keyword elinksColorGreen	    springgreen yellowgreen palegreen lime contained
+hi def link elinksPrefix            Identifier
-syn keyword elinksColorGreen	    chartreuse contained
+hi def link elinksOptions           Identifier
-syn keyword elinksColorYellow	    yellow beige darkkhaki lightgoldenrodyellow contained
+hi def      elinksColorBlack        ctermfg=Black       guifg=Black
-syn keyword elinksColorYellow	    palegoldenrod gold goldenrod khaki contained
+hi def      elinksColorDarkRed      ctermfg=DarkRed     guifg=DarkRed
-syn keyword elinksColorYellow	    lightyellow contained
+hi def      elinksColorDarkGreen    ctermfg=DarkGreen   guifg=DarkGreen
-syn keyword elinksColorBlue	    blue aliceblue aqua aquamarine azure contained
+hi def      elinksColorDarkYellow   ctermfg=DarkYellow  guifg=DarkYellow
-syn keyword elinksColorBlue	    dodgerblue lightblue lightskyblue contained
+hi def      elinksColorDarkBlue     ctermfg=DarkBlue    guifg=DarkBlue
-syn keyword elinksColorBlue	    lightsteelblue mediumblue contained
+hi def      elinksColorDarkMagenta  ctermfg=DarkMagenta guifg=DarkMagenta
-syn keyword elinksColorMagenta	    magenta darkviolet blueviolet lightpink contained
+hi def      elinksColorDarkCyan     ctermfg=DarkCyan    guifg=DarkCyan
-syn keyword elinksColorMagenta	    mediumvioletred palevioletred violet pink contained
+hi def      elinksColorGray         ctermfg=Gray        guifg=Gray
-syn keyword elinksColorMagenta	    fuchsia contained
+hi def      elinksColorDarkGray     ctermfg=DarkGray    guifg=DarkGray
-syn keyword elinksColorCyan	    cyan lightcyan powderblue skyblue turquoise contained
+hi def      elinksColorRed          ctermfg=Red         guifg=Red
-syn keyword elinksColorCyan	    paleturquoise contained
+hi def      elinksColorGreen        ctermfg=Green       guifg=Green
-syn keyword elinksColorWhite	    white antiquewhite floralwhite ghostwhite contained
+hi def      elinksColorYellow       ctermfg=Yellow      guifg=Yellow
-syn keyword elinksColorWhite	    navajowhite whitesmoke linen lemonchiffon contained
+hi def      elinksColorBlue         ctermfg=Blue        guifg=Blue
-syn keyword elinksColorWhite	    cornsilk lavender lavenderblush seashell contained
+hi def      elinksColorMagenta      ctermfg=Magenta     guifg=Magenta
-syn keyword elinksColorWhite	    mistyrose ivory papayawhip bisque gainsboro contained
+hi def      elinksColorCyan         ctermfg=Cyan        guifg=Cyan
-syn keyword elinksColorWhite	    honeydew mintcream moccasin oldlace contained
+hi def      elinksColorWhite        ctermfg=White       guifg=White
-syn keyword elinksColorWhite	    peachpuff snow wheat contained
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_elinks_syn_inits")
-  if version < 508
-    let did_elinks_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-    command -nargs=+ HiDef hi <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-    command -nargs=+ HiDef hi def <args>
-  endif
-
-  HiLink elinksTodo		Todo
-  HiLink elinksComment		Comment
-  HiLink elinksNumber		Number
-  HiLink elinksString		String
-  HiLink elinksKeyword		Keyword
-  HiLink elinksPrefix		Identifier
-  HiLink elinksOptions		Identifier
-  HiDef  elinksColorBlack	ctermfg=Black	    guifg=Black
-  HiDef  elinksColorDarkRed	ctermfg=DarkRed	    guifg=DarkRed
-  HiDef  elinksColorDarkGreen	ctermfg=DarkGreen   guifg=DarkGreen
-  HiDef  elinksColorDarkYellow	ctermfg=DarkYellow  guifg=DarkYellow
-  HiDef  elinksColorDarkBlue	ctermfg=DarkBlue    guifg=DarkBlue
-  HiDef  elinksColorDarkMagenta	ctermfg=DarkMagenta guifg=DarkMagenta
-  HiDef  elinksColorDarkCyan	ctermfg=DarkCyan    guifg=DarkCyan
-  HiDef  elinksColorGray	ctermfg=Gray	    guifg=Gray
-  HiDef  elinksColorDarkGray	ctermfg=DarkGray    guifg=DarkGray
-  HiDef  elinksColorRed		ctermfg=Red	    guifg=Red
-  HiDef  elinksColorGreen	ctermfg=Green	    guifg=Green
-  HiDef  elinksColorYellow	ctermfg=Yellow	    guifg=Yellow
-  HiDef  elinksColorBlue	ctermfg=Blue	    guifg=Blue
-  HiDef  elinksColorMagenta	ctermfg=Magenta	    guifg=Magenta
-  HiDef  elinksColorCyan	ctermfg=Cyan	    guifg=Cyan
-  HiDef  elinksColorWhite	ctermfg=White	    guifg=White
-
-  delcommand HiLink
-  delcommand HiDef
-endif
 
 let b:current_syntax = "elinks"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/eterm.vim

@@ -1,200 +1,428 @@
 " Vim syntax file
-" Language:	    Eterm configuration file
+" Language:         eterm(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/eterm/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-06
-" arch-tag:	    f4c58caf-2b91-4fc4-96af-e3cad7c70e6b
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" magic number
+let s:cpo_save = &cpo
-syn match   etermMagic		display "^<Eterm-[0-9.]\+>$"
+set cpo&vim
 
-" comments
-syn region  etermComment	matchgroup=etermComment start="^#" end="$" contains=etermTodo
-
-" todo
 syn keyword etermTodo             contained TODO FIXME XXX NOTE
 
-" numbers
+syn region  etermComment          matchgroup=etermComment start='^#' end='$'
-syn match   etermNumber		contained display "\<\(\d\+\|0x\x\{1,2}\)\>"
+                                  \ contains=etermTodo,@Spell
 
-" strings
+syn match   etermMagic            display display '^<Eterm-[0-9.]\+>$'
-syn region  etermString		contained display oneline start=+"+ skip=+\\"+ end=+"+
+
+syn match   etermNumber           contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+
+syn region  etermString           contained display oneline start=+"+
+                                  \ skip=+\\"+ end=+"+
 
-" booleans
 syn keyword etermBoolean          contained on off true false yes no
 
-" colors (not pretty, but can't figure out better way...)
+syn keyword etermPreProc          contained appname exec get put random version
-syn match   etermColor		contained display "\s\+#\x\{6}\>"
+                                  \ include preproc
-syn keyword etermColor		contained white black
 
-" preproc
+syn keyword etermFunctions        contained copy exit kill nop paste save
-syn match   etermPreProc	contained "%\(appname\|exec\|get\|put\|random\|version\|include\|preproc\)("he=e-1
+                                  \ scroll search spawn
 
-" functions
+syn cluster etermGeneral          contains=etermComment,etermFunction,
-syn match   etermFunctions	contained "\<\(copy\|exit\|kill\|nop\|paste\|save\|scroll\|search\|spawn\)("
+                                  \ etermPreProc
 
-" and make it easy to refer to the above...
+syn keyword etermKeyMod           contained ctrl shift lock mod1 mod2 mod3 mod4
-syn cluster etermGeneral	contains=etermComment,etermNumber,etermString,etermBoolean,etermColor,etermFunction,etermPreProc
+                                  \ mod5 alt meta anymod
+syn keyword etermKeyMod           contained button1 button2 button3 button4
+                                  \ button5
 
-" key modifiers
+syn keyword etermColorOptions     contained video nextgroup=etermVideoOptions
-syn keyword etermKeyMod		contained ctrl shift lock mod1 mod2 mod3 mod4 mod5 alt meta anymod
+                                  \ skipwhite
-syn keyword etermKeyMod		contained button1 button2 button3 button4 button5
 
-" color context
+syn keyword etermVideoType        contained normal reverse
-syn region  etermColorOptions	contained oneline matchgroup=etermOption start="^\s*video\>" matchgroup=etermType end="\<\(normal\|reverse\)\>"
-syn region  etermColorOptions	contained oneline matchgroup=etermOption start="^\s*color\>" matchgroup=etermType end="\<\(bd\|ul\|[0-9]\|1[0-5]\)\>"
-syn keyword etermColorOptions	contained foreground background cursor cursor_text pointer
 
-syn region  etermColorContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+color\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermColorOptions
+syn keyword etermColorOptions     contained foreground background cursor
+                                  \ cursor_text pointer
+                                  \ nextgroup=etermColorType skipwhite
 
-" attributes context
+syn keyword etermColorType        contained bd ul
-syn region  etermAttrOptions	contained oneline matchgroup=etermOption start="^\s*geometry\>" matchgroup=etermType end="\<\d\+x\d\++\d\++\d\+\>"
+syn match   etermColorType        contained display '\<\%(\d\|1[0-5]\)'
-syn region  etermAttrOptions	contained oneline matchgroup=etermOption start="^\s*scrollbar_type\>" matchgroup=etermType end="\<\(motif\|xterm\|next\)\>"
-syn region  etermAttrOptions	contained oneline matchgroup=etermOption start="^\s*font\>" matchgroup=etermType end="\<\(bold\|default\|proportional\|fx\|[0-5]\)\>"
-syn keyword etermAttrOptions	contained title name iconname desktop scrollbar_width
 
-syn region  etermAttrContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+attributes\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermAttrOptions
+syn keyword etermColorOptions     contained color
+                                  \ nextgroup=etermColorNumber skipwhite
+
+syn keyword etermColorNumber      contained bd ul nextgroup=etermColorSpec
+                                  \ skipwhite
+syn match   etermColorNumber      contained display '\<\%(\d\|1[0-5]\)'
+                                  \ nextgroup=etermColorSpec skipwhite
+
+syn match   etermColorSpec        contained display '\S\+'
+
+syn region  etermColorContext     fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+color'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermColorOptions
+
+syn keyword etermAttrOptions      contained geometry nextgroup=etermGeometry
+                                  \ skipwhite
+
+syn match   etermGeometry         contained display '\d\+x\d++\d\++\d\+'
+
+syn keyword etermAttrOptions      contained scrollbar_type
+                                  \ nextgroup=etermScrollbarType skipwhite
+
+syn keyword etermScrollbarType    contained motif xterm next
+
+syn keyword etermAttrOptions      contained font nextgroup=etermFontType
+                                  \ skipwhite
+
+syn keyword etermFontType         contained bold nextgroup=etermFont skipwhite
+syn match   etermFontType         contained display '[0-5]' nextgroup=etermFont
+                                  \ skipwhite
+
+syn match   etermFont             contained display '\S\+'
+
+syn keyword etermFontType         contained default nextgroup=etermNumber
+                                  \ skipwhite
+
+syn keyword etermFontType         contained proportional nextgroup=etermBoolean
+                                  \ skipwhite
+
+syn keyword etermFontType         contained fx nextgroup=etermString skipwhite
+
+syn keyword etermAttrOptions      contained title name iconname
+                                  \ nextgroup=etermString skipwhite
+
+syn keyword etermAttrOptions      contained scrollbar_width desktop
+                                  \ nextgroup=etermNumber skipwhite
+
+syn region  etermAttrContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+attributes\'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermAttrOptions
+
+syn keyword etermIClassOptions    contained icon path nextgroup=etermString
+                                  \ skipwhite
+syn keyword etermIClassOptions    contained cache nextgroup=etermNumber
+                                  \ skipwhite
+syn keyword etermIClassOptions    contained anim nextgroup=etermNumber
+                                  \ skipwhite
+
+syn region  etermIClassContext    fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+imageclasses'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermImageContext,
+                                  \ etermIClassOptions
+
+syn keyword etermImageOptions     contained type nextgroup=etermImageType
+                                  \ skipwhite
 
-" image context
-" image types
 syn keyword etermImageTypes       contained background trough anchor up_arrow
-syn keyword etermImageTypes	contained left_arrow right_arrow menu menuitem
+                                  \ left_arrow right_arrow menu menuitem
-syn keyword etermImageTypes	contained submenu button buttonbar down_arrow
+                                  \ submenu button buttonbar down_arrow
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*type\>" end="$" contains=etermImageTypes
+
-" image modes
+syn keyword etermImageOptions     contained mode nextgroup=etermImageModes
+                                  \ skipwhite
+
 syn keyword etermImageModes       contained image trans viewport auto solid
-syn keyword etermImageModesAllow contained allow
+                                  \ nextgroup=etermImageModesAllow skipwhite
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*mode\>" end="$" contains=etermImageModes,etermImageModesAllow
+syn keyword etermImageModesAllow  contained allow nextgroup=etermImageModesR
-" image states
+                                  \ skipwhite
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*state\>" matchgroup=etermType end="\<\(normal\|selected\|clicked\|disabled\)\>"
+syn keyword etermImageModesR      contained image trans viewport auto solid
-" image geometry
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*geom\>" matchgroup=etermType end="\s\+\(\d\+x\d\++\d\++\d\+\)\=:\(\(tile\|scale\|hscale\|vscale\|propscale\)d\=\)\="
-" image color modification
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*\(cmod\|colormod\)\>" matchgroup=etermType end="\<\(image\|red\|green\|blue\)\>"
-" other keywords
-syn keyword etermImageOptions	contained file padding border bevel color
 
-syn region  etermImageContext	contained transparent fold matchgroup=etermContext start="^\s*begin\s\+image\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermImageOptions
+syn keyword etermImageOptions     contained state nextgroup=etermImageState
+                                  \ skipwhite
 
-" imageclasses context
+syn keyword etermImageState       contained normal selected clicked disabled
-syn keyword etermIClassOptions	contained icon cache path anim
 
-syn region  etermIClassContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+imageclasses\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermImageContext,etermIClassOptions
+syn keyword etermImageOptions     contained color nextgroup=etermImageColorFG
+                                  \ skipwhite
 
-" menuitem context
+syn keyword etermImageColorFG     contained '\S\+' nextgroup=etermImageColorBG
-syn region  etermMenuItemOptions contained transparent oneline matchgroup=etermOption start="^\s*action\>" matchgroup=etermType end="\<string\|echo\|submenu\|script\|separator\>"
+                                  \ skipwhite
-syn keyword etermMenuItemOptions contained text rtext
 
-syn region  etermMenuItemContext fold transparent matchgroup=etermContext start="^\s*begin\s\+menuitem\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMenuItemOptions
+syn keyword etermImageColorBG     contained '\S\+'
 
-" menu context (should contain - as well, but no...)
+syn keyword etermImageOptions     contained file nextgroup=etermString
-syn keyword etermMenuOptions    contained title font_name sep
+                                  \ skipwhite
 
-syn region  etermMenuContext    fold transparent  matchgroup=etermContext start="^\s*begin\s\+menu\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMenuOptions,etermMenuItemContext
+syn keyword etermImageOptions     contained geom nextgroup=etermImageGeom
+                                  \ skipwhite
 
-" action context
+syn match   etermImageGeom        contained display
-syn match   etermActionDef	contained "\<\(to\|string\|echo\|menu\|script\)\>"
+                                  \ '\s\+\%(\d\+x\d\++\d\++\d\+\)\=:\%(\%(tie\|scale\|hscale\|vscale\|propscale\)d\=\)\='
-syn region  etermActionsOptions	contained transparent oneline matchgroup=etermOption start="^\s*bind\>" end="$" contains=etermActionDef,etermKeyMod
 
-syn region  etermActionsContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+actions\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermActionsOptions
+syn keyword etermImageOptions     contained cmod colormod
+                                  \ nextgroup=etermImageCmod skipwhite
 
-" button bar context
+syn keyword etermImageCmod        contained image red green blue
-syn match   etermButtonDef	contained "\<\(action\|string\|echo\|menu\|scrupt\)\>"
+                                  \ nextgroup=etermImageBrightness skipwhite
-syn region  etermButtonOptions	contained transparent oneline matchgroup=etermOption start="^\s*button\>" end="$" contains=etermButtonDef
-syn keyword etermButtonOptions	contained font visible dock
 
-syn region  etermButtonContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+button_bar\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermButtonOptions
+syn match   etermImageBrightness  contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageContrast skipwhite
 
-" multichar context
+syn match   etermImageContrast    contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
-syn keyword etermMultiOptions	contained encoding font
+                                  \ nextgroup=etermImageGamma skipwhite
 
-syn region  etermMultiContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+multichar\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMultiOptions
+syn match   etermImageGamma       contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageGamma skipwhite
 
-" xim context
+syn region  etermImageOptions     contained matchgroup=etermImageOptions
-syn keyword etermXimOptions     contained input_method preedit_type
+                                  \ start='border\|bevel\%(\s\+\%(up\|down\)\)\|padding'
+                                  \ end='$' contains=etermNumber
 
-syn region  etermXimContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+xim\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermXimOptions
+syn region  etermImageContext     contained fold transparent
+                                  \ matchgroup=etermContext
+                                  \ start='^\s*begin\s\+image'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermImageOptions
 
-" toggles context
+syn keyword etermMenuItemOptions  contained action
-syn keyword etermTogOptions	contained map_alert visual_bell login_shell scrollbar utmp_logging meta8 iconic no_input
+                                  \ nextgroup=etermMenuItemAction skipwhite
-syn keyword etermTogOptions	contained home_on_output home_on_input scrollbar_floating scrollbar_right scrollbar_popup
-syn keyword etermTogOptions	contained borderless double_buffer no_cursor pause xterm_select select_line
-syn keyword etermTogOptions	contained select_trailing_spaces report_as_keysyms itrans immotile_trans buttonbar
-syn keyword etermTogOptions	contained resize_gravity
 
-syn region  etermTogContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+toggles\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermTogOptions
+syn keyword etermMenuItemAction   contained string echo submenu script
+                                  \ nextgroup=etermString skipwhite
 
-" keyboard context
+syn keyword etermMenuItemAction   contained separator
-syn keyword etermKeyboardOptions contained smallfont_key bigfont_key keysym meta_mod alt_mod
-syn keyword etermKeyboardOptions contained greek numlock_mod app_keypad app_cursor
 
-syn region  etermKeyboardContext fold transparent  matchgroup=etermContext start="^\s*begin\s\+keyboard\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermKeyboardOptions
+syn keyword etermMenuItemOptions  contained text rtext nextgroup=etermString
+                                  \ skipwhite
 
-" misc context
+syn region  etermMenuItemContext  contained fold transparent
-syn keyword etermMiscOptions	contained print_pipe save_lines cut_chars min_anchor_size
+                                  \ matchgroup=etermContext
-syn keyword etermMiscOptions	contained border_width line_space finished_title term_name
+                                  \ start='^\s*begin\s\+menuitem'
-syn keyword etermMiscOptions	contained finished_text exec
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMenuItemOptions
 
-syn region  etermMiscContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+misc\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMiscOptions
+syn keyword etermMenuOptions      contained title nextgroup=etermString
+                                  \ skipwhite
+
+syn keyword etermMenuOptions      contained font_name nextgroup=etermFont
+                                  \ skipwhite
+
+syn match   etermMenuOptions      contained display '\<sep\>\|-'
+
+syn region  etermMenuContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+menu'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMenuOptions,
+                                  \ etermMenuItemContext
+
+syn keyword etermBind             contained bind nextgroup=etermBindMods
+                                  \ skipwhite
+
+syn keyword etermBindMods         contained ctrl shift lock mod1 mod2 mod3 mod4
+                                  \ mod5 alt meta anymod
+                                  \ nextgroup=etermBindMods skipwhite
+
+syn keyword etermBindTo           contained to nextgroup=etermBindType
+                                  \ skipwhite
+
+syn keyword etermBindType         contained string echo menu script
+                                  \ nextgroup=etermBindParam skipwhite
+
+syn match   etermBindParam        contained display '\S\+'
+
+syn region  etermActionsContext   fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+actions'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermActionsOptions
+
+syn keyword etermButtonOptions    contained font nextgroup=etermFont skipwhite
+syn keyword etermButtonOptions    contained visible nextgroup=etermBoolean
+                                  \ skipwhite
+syn keyword etermButtonOptions    contained dock nextgroup=etermDockOption
+                                  \ skipwhite
+
+syn keyword etermDockOption       contained top bottom no
+
+syn keyword etermButton           contained button nextgroup=etermButtonText
+                                  \ skipwhite
+
+syn region  etermButtonText       contained display oneline start=+"+
+                                  \ skip=+\\"+ end=+"+
+                                  \ nextgroup=etermButtonIcon skipwhite
+
+syn keyword etermButtonIcon       contained icon nextgroup=etermButtonIconFile
+                                  \ skipwhite
+
+syn keyword etermButtonIconFile   contained '\S\+' nextgroup=etermButtonAction
+                                  \ skipwhite
+
+syn keyword etermButtonAction     contained action nextgroup=etermBindType
+                                  \ skipwhite
+
+syn region  etermButtonContext    fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+button_bar'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermButtonOptions
+
+syn keyword etermMultiOptions     contained encoding nextgroup=etermEncoding
+                                  \ skipwhite
+
+syn keyword etermEncoding         eucj sjis euckr big5 gb
+syn match   etermEncoding         display 'iso-10646'
+
+syn keyword etermMultiOptions     contained font nextgroup=etermFontType
+                                  \ skipwhite
+
+syn region  etermMultiContext     fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+multichar'
+                                  \ end="^\s*end\>'
+                                  \ contains=@etermGeneral,etermMultiOptions
+
+syn keyword etermXimOptions       contained input_method
+                                  \ nextgroup=etermInputMethod skipwhite
+
+syn match   etermInputMethod      contained display '\S+'
+
+syn keyword etermXimOptions       contained preedit_type
+                                  \ nextgroup=etermPreeditType skipwhite
+
+syn keyword etermPreeditType      contained OverTheSpot OffTheSpot Root
+
+syn region  etermXimContext       fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+xim'
+                                  \ end="^\s*end\>'
+                                  \ contains=@etermGeneral,etermXimOptions
+
+syn keyword etermTogOptions       contained map_alert visual_bell login_shell
+                                  \ scrollbar utmp_logging meta8 iconic
+                                  \ no_input home_on_output home_on_input
+                                  \ scrollbar_floating scrollbar_right
+                                  \ scrollbar_popup borderless double_buffer
+                                  \ no_cursor pause xterm_select select_line
+                                  \ select_trailing_spaces report_as_keysyms
+                                  \ itrans immotile_trans buttonbar
+                                  \ resize_gravity nextgroup=etermBoolean
+                                  \ skipwhite
+
+syn region  etermTogContext       fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+toggles'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermTogOptions
+
+syn keyword etermKeyboardOptions  contained smallfont_key bigfont_key keysym
+                                  \ nextgroup=etermKeysym skipwhite
+
+syn keyword etermKeysym           contained '\S\+' nextgroup=etermString
+                                  \ skipwhite
+
+syn keyword etermKeyboardOptions  contained meta_mod alt_mod numlock_mod
+                                  \ nextgroup=etermNumber skipwhite
+
+syn keyword etermKeyboardOptions  contained greek app_keypad app_cursor
+                                  \ nextgroup=etermBoolean skipwhite
+
+syn region  etermKeyboardContext  fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+keyboard'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermKeyboardOptions
+
+syn keyword etermMiscOptions      contained print_pipe cut_chars finished_title
+                                  \ finished_text term_name exec
+                                  \ nextgroup=etermString skipwhite
+
+syn keyword etermMiscOptions      contained save_lines min_anchor_size
+                                  \ border_width line_space
+
+syn region  etermMiscContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+misc'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMiscOptions
+
+syn keyword etermEScreenOptions   contained url nextgroup=etermURL skipwhite
+
+syn match   etermURL              contained display
+                                  \ '\<\%(screen\|twin\)://\%([^@:/]\+\%(@[^:/]\+\%(:[^/]\+\)\=\)\=\)\=/\S\+'
+
+syn keyword etermEScreenOptions   contained firewall
+
+syn keyword etermEScreenOptions   contained delay nextgroup=etermNumber
+                                  \ skipwhite
+
+syn keyword etermEScreenOptions   contained bbar_font nextgroup=etermFont
+                                  \ skipwhite
+
+syn keyword etermEScreenOptions   contained bbar_dock nextgroup=etermDockOption
+                                  \ skipwhite
+
+syn region  etermEScreenContext   fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+escreen'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermEScreenOptions
 
 if exists("eterm_minlines")
   let b:eterm_minlines = eterm_minlines
 else
-  let b:eterm_minlines = 30
+  let b:eterm_minlines = 50
 endif
 exec "syn sync minlines=" . b:eterm_minlines
 
-" Define the default highlighting.
+hi def link etermTodo             Todo
-" For version 5.7 and earlier: only when not done already
+hi def link etermComment          Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link etermMagic            PreProc
-if version >= 508 || !exists("did_eterm_syn_inits")
+hi def link etermNumber           Number
-  if version < 508
+hi def link etermString           String
-    let did_eterm_syn_inits = 1
+hi def link etermBoolean          Boolean
-    command -nargs=+ HiLink hi link <args>
+hi def link etermPreProc          PreProc
-  else
+hi def link etermFunctions        Function
-    command -nargs=+ HiLink hi def link <args>
+hi def link etermKeyMod           Constant
-  endif
+hi def link etermOption           Keyword
-
+hi def link etermColorOptions     etermOption
-  HiLink etermMagic		Special
+hi def link etermColor            String
-  HiLink etermComment		Comment
+hi def link etermVideoType        Type
-  HiLink etermTodo		Todo
+hi def link etermColorType        Type
-  HiLink etermNumber		Number
+hi def link etermColorNumber      Number
-  HiLink etermString		String
+hi def link etermColorSpec        etermColor
-  HiLink etermBoolean		Boolean
+hi def link etermContext          Keyword
-  HiLink etermColor		Number
+hi def link etermAttrOptions      etermOption
-  HiLink etermPreProc		PreProc
+hi def link etermGeometry         String
-  HiLink etermFunctions    	Function
+hi def link etermScrollbarType    Type
-  HiLink etermKeyMod		Special
+hi def link etermFontType         Type
-  HiLink etermContext		Keyword
+hi def link etermIClassOptions    etermOption
-  HiLink etermOption		Keyword
+hi def link etermImageOptions     etermOption
-  HiLink etermType		Type
+hi def link etermImageTypes       Type
-  HiLink etermColorOptions	Keyword
+hi def link etermImageModes       Type
-  HiLink etermAttrOptions	Keyword
+hi def link etermImageModesAllow  Keyword
-  HiLink etermIClassOptions	Keyword
+hi def link etermImageModesR      Type
-  HiLink etermImageTypes	Type
+hi def link etermImageState       Keyword
-  HiLink etermImageModes	Type
+hi def link etermImageColorFG     etermColor
-  HiLink etermImageModesAllow	Keyword
+hi def link etermImageColorBG     etermColor
-  HiLink etermImageOptions	Keyword
+hi def link etermImageGeom        String
-  HiLink etermMenuOptions	Keyword
+hi def link etermImageCmod        etermOption
-  HiLink etermMenuItemOptions	Keyword
+hi def link etermImageBrightness  Number
-  HiLink etermActionDef	Type
+hi def link etermImageContrast    Number
-  HiLink etermActionsOptions	Keyword
+hi def link etermImageGamma       Number
-  HiLink etermButtonDef	Type
+hi def link etermMenuItemOptions  etermOption
-  HiLink etermButtonOptions	Keyword
+hi def link etermMenuItemAction   Keyword
-  HiLink etermMultiOptions	Keyword
+hi def link etermMenuOptions      etermOption
-  HiLink etermXimOptions	Keyword
+hi def link etermBind             Keyword
-  HiLink etermTogOptions	Keyword
+hi def link etermBindMods         Identifier
-  HiLink etermKeyboardOptions	Keyword
+hi def link etermBindTo           Keyword
-  HiLink etermMiscOptions	Keyword
+hi def link etermBindType         Type
-  delcommand HiLink
+hi def link etermBindParam        String
-endif
+hi def link etermButtonOptions    etermOption
+hi def link etermDockOption       etermOption
+hi def link etermButtonText       String
+hi def link etermButtonIcon       String
+hi def link etermButtonIconFile   String
+hi def link etermButtonAction     Keyword
+hi def link etermMultiOptions     etermOption
+hi def link etermEncoding         Identifier
+hi def link etermXimOptions       etermOption
+hi def link etermInputMethod      Identifier
+hi def link etermPreeditType      Type
+hi def link etermTogOptions       etermOption
+hi def link etermKeyboardOptions  etermOption
+hi def link etermKeysym           Constant
+hi def link etermMiscOptions      etermOption
+hi def link etermEScreenOptions   etermOption
+hi def link etermURL              Identifier
 
 let b:current_syntax = "eterm"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/fetchmail.vim

@@ -1,88 +1,74 @@
 " Vim syntax file
 " Language:         fetchmail(1) RC File
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/fetchmail/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-06
-" arch-tag:	    59d8adac-6e59-45f6-88cb-f9ba1e009c1f
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" todo
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword fetchmailTodo       contained FIXME TODO XXX NOTE
 
-" comments
+syn region  fetchmailComment    start='#' end='$' contains=fetchmailTodo,@Spell
-syn region  fetchmailComment	start="#" end="$" contains=fetchmailTodo
 
-" numbers
+syn match   fetchmailNumber     display '\<\d\+\>'
-syn match   fetchmailNumber	"\<\d\+\>"
 
-" strings
+syn region  fetchmailString     start=+"+ skip=+\\\\\|\\"+ end=+"+
-syn region  fetchmailString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=fetchmailStringEsc
+                                \ contains=fetchmailStringEsc
-syn region  fetchmailString	start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=fetchmailStringEsc
+syn region  fetchmailString     start=+'+ skip=+\\\\\|\\'+ end=+'+
+                                \ contains=fetchmailStringEsc
 
-" escape characters in strings
+syn match   fetchmailStringEsc  contained '\\\([ntb]\|0\d*\|x\x\+\)'
-syn match   fetchmailStringEsc	"\\\([ntb]\|0\d*\|x\x\+\)"
 
-" server entries
+syn region  fetchmailKeyword    transparent matchgroup=fetchmailKeyword
-syn region  fetchmailKeyword	transparent matchgroup=fetchmailKeyword start="\<poll\|skip\|defaults\>" end="\<poll\|skip\|defaults\>" contains=ALLBUT,fetchmailOptions,fetchmailSet
+                                \ start='\<poll\|skip\|defaults\>'
+                                \ end='\<poll\|skip\|defaults\>'
+                                \ contains=ALLBUT,fetchmailOptions,fetchmailSet
 
-" server options
+syn keyword fetchmailServerOpts contained via proto[col] local[domains] port
-syn keyword fetchmailServerOpts	contained via proto[col] local[domains] port auth[enticate]
+                                \ auth[enticate] timeout envelope qvirtual aka
-syn keyword fetchmailServerOpts	contained timeout envelope qvirtual aka interface monitor
+                                \ interface monitor plugin plugout dns
-syn keyword fetchmailServerOpts	contained plugin plugout dns checkalias uidl interval netsec
+                                \ checkalias uidl interval netsec principal
-syn keyword fetchmailServerOpts	contained principal esmtpname esmtppassword
+                                \ esmtpname esmtppassword
-syn match   fetchmailServerOpts	contained "\<no\_s\+\(envelope\|dns\|checkalias\|uidl\)"
+syn match   fetchmailServerOpts contained '\<no\_s\+\(envelope\|dns\|checkalias\|uidl\)'
 
-" user options
+syn keyword fetchmailUserOpts   contained user[name] is to pass[word] ssl
-syn keyword fetchmailUserOpts	contained user[name] is to pass[word] ssl sslcert sslkey sslproto folder
+                                \ sslcert sslkey sslproto folder smtphost
-syn keyword fetchmailUserOpts	contained smtphost fetchdomains smtpaddress smtpname antispam mda bsmtp
+                                \ fetchdomains smtpaddress smtpname antispam
-syn keyword fetchmailUserOpts	contained preconnect postconnect keep flush fetchall rewrite stripcr
+                                \ mda bsmtp preconnect postconnect keep flush
-syn keyword fetchmailUserOpts	contained forcecr pass8bits dropstatus dropdelivered mimedecode idle
+                                \ fetchall rewrite stripcr forcecr pass8bits
-syn keyword fetchmailUserOpts	contained limit warnings batchlimit fetchlimit expunge tracepolls properties
+                                \ dropstatus dropdelivered mimedecode idle
-syn match   fetchmailUserOpts	contained "\<no\_s\+\(keep\|flush\|fetchall\|rewrite\|stripcr\|forcecr\|pass8bits\|dropstatus\|dropdelivered\|mimedecode\|noidle\)"
+                                \ limit warnings batchlimit fetchlimit expunge
+                                \ tracepolls properties
+syn match   fetchmailUserOpts   contained '\<no\_s\+\(keep\|flush\|fetchall\|rewrite\|stripcr\|forcecr\|pass8bits\|dropstatus\|dropdelivered\|mimedecode\|noidle\)'
 
 syn keyword fetchmailSpecial    contained here there
 
-
-" noise keywords
 syn keyword fetchmailNoise      and with has wants options
-syn match   fetchmailNoise	"[:;,]"
+syn match   fetchmailNoise      display '[:;,]'
 
-" options
 syn keyword fetchmailSet        nextgroup=fetchmailOptions skipwhite skipnl set
 
-syn keyword fetchmailOptions	daemon postmaster bouncemail spambounce logfile idfile syslog nosyslog properties
+syn keyword fetchmailOptions    daemon postmaster bouncemail spambounce logfile
-syn match   fetchmailOptions	"\<no\_s\+\(bouncemail\|spambounce\)"
+                                \ idfile syslog nosyslog properties
+syn match   fetchmailOptions    '\<no\_s\+\(bouncemail\|spambounce\)'
 
-" Define the default highlighting.
+hi def link fetchmailComment    Comment
-" For version 5.7 and earlier: only when not done already
+hi def link fetchmailTodo       Todo
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link fetchmailNumber     Number
-if version >= 508 || !exists("did_fetchmail_syn_inits")
+hi def link fetchmailString     String
-  if version < 508
+hi def link fetchmailStringEsc  SpecialChar
-    let did_fetchmail_syn_inits = 1
+hi def link fetchmailKeyword    Keyword
-    command -nargs=+ HiLink hi link <args>
+hi def link fetchmailServerOpts Identifier
-  else
+hi def link fetchmailUserOpts   Identifier
-    command -nargs=+ HiLink hi def link <args>
+hi def link fetchmailSpecial    Special
-  endif
+hi def link fetchmailSet        Keyword
-
+hi def link fetchmailOptions    Identifier
-  HiLink fetchmailComment	Comment
-  HiLink fetchmailTodo	Todo
-  HiLink fetchmailNumber	Number
-  HiLink fetchmailString	String
-  HiLink fetchmailStringEsc	SpecialChar
-  HiLink fetchmailKeyword	Keyword
-  HiLink fetchmailServerOpts	Identifier
-  HiLink fetchmailUserOpts	Identifier
-  HiLink fetchmailSpecial	Special
-  HiLink fetchmailSet		Keyword
-  HiLink fetchmailOptions	Identifier
-  delcommand HiLink
-endif
 
 let b:current_syntax = "fetchmail"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/gpg.vim

@@ -1,72 +1,105 @@
 " Vim syntax file
-" Language:	    GnuPG Configuration File.
+" Language:         gpg(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/gpg/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-06
-" arch-tag:	    602305f7-d8ae-48ef-a68f-4d54f12af70a
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
+let s:cpo_save = &cpo
-" For version 5.x: Set it globally
+set cpo&vim
-" For version 6.x: Set it locally
-if version >= 600
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk 48-57,65-90,97-122,-
-delcommand SetIsk
 
-" comments
+setlocal iskeyword=@,48-57,-
-syn region  gpgComment	    contained display oneline start="#" end="$" contains=gpgTodo,gpgID
 
-" todo
 syn keyword gpgTodo     contained FIXME TODO XXX NOTE
 
-" ids
+syn region  gpgComment  contained display oneline start='#' end='$'
-syn match   gpgID	    contained display "\<\(0x\)\=\x\{8,}\>"
+                        \ contains=gpgTodo,gpgID,@Spell
 
-syn match   gpgBegin	    "^" skipwhite nextgroup=gpgComment,gpgOption,gpgCommand
+syn match   gpgID       contained display '\<\(0x\)\=\x\{8,}\>'
 
-" commands that take args
+syn match   gpgBegin    display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand
-syn keyword gpgCommand      contained skipwhite nextgroup=gpgArg check-sigs decrypt decrypt-files delete-key delete-secret-and-public-key delete-secret-key edit-key encrypt-files export export-all export-ownertrust export-secret-keys export-secret-subkeys fast-import fingerprint gen-prime gen-random import import-ownertrust list-keys list-public-keys list-secret-keys list-sigs lsign-key nrsign-key print-md print-mds recv-keys search-keys send-keys sign-key verify verify-files
-" commands that take no args
-syn keyword gpgCommand      contained skipwhite nextgroup=gpgArgError check-trustdb clearsign desig-revoke detach-sign encrypt gen-key gen-revoke help list-packets rebuild-keydb-caches sign store symmetric update-trustdb version warranty
 
-" options that take args
+syn keyword gpgCommand  contained skipwhite nextgroup=gpgArg
-syn keyword gpgOption       contained skipwhite nextgroup=gpgArg attribute-fd cert-digest-algo charset cipher-algo command-fd comment completes-needed compress compress-algo debug default-cert-check-level default-key default-preference-list default-recipient digest-algo disable-cipher-algo disable-pubkey-algo encrypt-to exec-path export-options group homedir import-options keyring keyserver keyserver-options load-extension local-user logger-fd marginals-needed max-cert-depth notation-data options output override-session-key passphrase-fd personal-cipher-preferences personal-compress-preferences personal-digest-preferences photo-viewer recipient s2k-cipher-algo s2k-digest-algo s2k-mode secret-keyring set-filename set-policy-url status-fd trusted-key
+                        \ check-sigs decrypt decrypt-files delete-key
-" options that take no args
+                        \ delete-secret-and-public-key delete-secret-key
-syn keyword gpgOption       contained skipwhite nextgroup=gpgArgError allow-freeform-uid allow-non-selfsigned-uid allow-secret-key-import always-trust armor ask-cert-expire ask-sig-expire auto-check-trustdb batch debug-all default-comment default-recipient-self dry-run emit-version emulate-md-encode-bug enable-special-filenames escape-from-lines expert fast-list-mode fixed-list-mode for-your-eyes-only force-mdc force-v3-sigs force-v4-certs gpg-agent-info ignore-crc-error ignore-mdc-error ignore-time-conflict ignore-valid-from interactive list-only lock-multiple lock-never lock-once merge-only no no-allow-non-selfsigned-uid no-armor no-ask-cert-expire no-ask-sig-expire no-auto-check-trustdb no-batch no-comment no-default-keyring no-default-recipient no-encrypt-to no-expensive-trust-checks no-expert no-for-your-eyes-only no-force-v3-sigs no-force-v4-certs no-greeting no-literal no-mdc-warning no-options no-permission-warning no-pgp2 no-pgp6 no-pgp7 no-random-seed-file no-secmem-warning no-show-notation no-show-photos no-show-policy-url no-sig-cache no-sig-create-check no-sk-comments no-tty no-utf8-strings no-verbose no-version not-dash-escaped openpgp pgp2 pgp6 pgp7 preserve-permissions quiet rfc1991 set-filesize show-keyring show-notation show-photos show-policy-url show-session-key simple-sk-checksum sk-comments skip-verify textmode throw-keyid try-all-secrets use-agent use-embedded-filename utf8-strings verbose with-colons with-fingerprint with-key-data yes
+                        \ edit-key encrypt-files export export-all
+                        \ export-ownertrust export-secret-keys
+                        \ export-secret-subkeys fast-import fingerprint
+                        \ gen-prime gen-random import import-ownertrust
+                        \ list-keys list-public-keys list-secret-keys
+                        \ list-sigs lsign-key nrsign-key print-md print-mds
+                        \ recv-keys search-keys send-keys sign-key verify
+                        \ verify-files
+syn keyword gpgCommand  contained skipwhite nextgroup=gpgArgError
+                        \ check-trustdb clearsign desig-revoke detach-sign
+                        \ encrypt gen-key gen-revoke help list-packets
+                        \ rebuild-keydb-caches sign store symmetric
+                        \ update-trustdb version warranty
 
-" arguments to commands and options
+syn keyword gpgOption   contained skipwhite nextgroup=gpgArg
-syn match   gpgArg          contained display "\S\+\(\s\+\S\+\)*" contains=gpgID
+                        \ attribute-fd cert-digest-algo charset cipher-algo
-syn match   gpgArgError     contained display "\S\+\(\s\+\S\+\)*"
+                        \ command-fd comment completes-needed compress
+                        \ compress-algo debug default-cert-check-level
+                        \ default-key default-preference-list
+                        \ default-recipient digest-algo disable-cipher-algo
+                        \ disable-pubkey-algo encrypt-to exec-path
+                        \ export-options group homedir import-options
+                        \ keyring keyserver keyserver-options load-extension
+                        \ local-user logger-fd marginals-needed max-cert-depth
+                        \ notation-data options output override-session-key
+                        \ passphrase-fd personal-cipher-preferences
+                        \ personal-compress-preferences
+                        \ personal-digest-preferences photo-viewer
+                        \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
+                        \ secret-keyring set-filename set-policy-url status-fd
+                        \ trusted-key
+syn keyword gpgOption   contained skipwhite nextgroup=gpgArgError
+                        \ allow-freeform-uid allow-non-selfsigned-uid
+                        \ allow-secret-key-import always-trust
+                        \ armor ask-cert-expire ask-sig-expire
+                        \ auto-check-trustdb batch debug-all default-comment
+                        \ default-recipient-self dry-run emit-version
+                        \ emulate-md-encode-bug enable-special-filenames
+                        \ escape-from-lines expert fast-list-mode
+                        \ fixed-list-mode for-your-eyes-only
+                        \ force-mdc force-v3-sigs force-v4-certs
+                        \ gpg-agent-info ignore-crc-error ignore-mdc-error
+                        \ ignore-time-conflict ignore-valid-from interactive
+                        \ list-only lock-multiple lock-never lock-once
+                        \ merge-only no no-allow-non-selfsigned-uid
+                        \ no-armor no-ask-cert-expire no-ask-sig-expire
+                        \ no-auto-check-trustdb no-batch no-comment
+                        \ no-default-keyring no-default-recipient
+                        \ no-encrypt-to no-expensive-trust-checks
+                        \ no-expert no-for-your-eyes-only no-force-v3-sigs
+                        \ no-force-v4-certs no-greeting no-literal
+                        \ no-mdc-warning no-options no-permission-warning
+                        \ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file
+                        \ no-secmem-warning no-show-notation no-show-photos
+                        \ no-show-policy-url no-sig-cache no-sig-create-check
+                        \ no-sk-comments no-tty no-utf8-strings no-verbose
+                        \ no-version not-dash-escaped openpgp pgp2
+                        \ pgp6 pgp7 preserve-permissions quiet rfc1991
+                        \ set-filesize show-keyring show-notation show-photos
+                        \ show-policy-url show-session-key simple-sk-checksum
+                        \ sk-comments skip-verify textmode throw-keyid
+                        \ try-all-secrets use-agent use-embedded-filename
+                        \ utf8-strings verbose with-colons with-fingerprint
+                        \ with-key-data yes
 
-" Define the default highlighting.
+syn match   gpgArg      contained display '\S\+\(\s\+\S\+\)*' contains=gpgID
-" For version 5.7 and earlier: only when not done already
+syn match   gpgArgError contained display '\S\+\(\s\+\S\+\)*'
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_gpg_syn_inits")
-  if version < 508
-    let did_gpg_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
 
-  HiLink gpgComment   Comment
+hi def link gpgComment  Comment
-  HiLink gpgTodo      Todo
+hi def link gpgTodo     Todo
-  HiLink gpgID        Number
+hi def link gpgID       Number
-  HiLink gpgOption    Keyword
+hi def link gpgOption   Keyword
-  HiLink gpgCommand   Error
+hi def link gpgCommand  Error
-  HiLink gpgArgError  Error
+hi def link gpgArgError Error
-  delcommand HiLink
-endif
 
 let b:current_syntax = "gpg"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/grub.vim

@@ -1,77 +1,93 @@
 " Vim syntax file
-" Language:	    GRUB Configuration File
+" Language:         grub(8) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/grub/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-06
-" arch-tag:	    7a56ddd0-e551-44bc-b8c0-235fedbdf3c0
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" comments
+let s:cpo_save = &cpo
-syn region  grubComment	    display oneline start="^#" end="$" contains=grubTodo
+set cpo&vim
 
-" todo
 syn keyword grubTodo          contained TODO FIXME XXX NOTE
 
-" devices
+syn region  grubComment       display oneline start='^#' end='$'
-syn match   grubDevice	    display "(\([fh]d\d\|\d\+\|0x\x\+\)\(,\d\+\)\=\(,\l\)\=)"
+                              \ contains=grubTodo,@Spell
 
-" block lists
+syn match   grubDevice        display
-syn match   grubBlock	    display "\(\d\+\)\=+\d\+\(,\(\d\+\)\=+\d\+\)*"
+                              \ '(\([fh]d\d\|\d\+\|0x\x\+\)\(,\d\+\)\=\(,\l\)\=)'
 
-" numbers
+syn match   grubBlock         display '\(\d\+\)\=+\d\+\(,\(\d\+\)\=+\d\+\)*'
-syn match   grubNumbers	    display "+\=\<\d\+\|0x\x\+\>"
 
-syn match  grubBegin	    display "^" nextgroup=grubCommand,grubComment skipwhite
+syn match   grubNumbers       display '+\=\<\d\+\|0x\x\+\>'
 
-" menu commands
+syn match   grubBegin         display '^'
-syn keyword grubCommand	    contained default fallback hiddenmenu timeout title
+                              \ nextgroup=@grubCommands,grubComment skipwhite
 
-" general commands
+syn cluster grubCommands      contains=grubCommand,grubTitleCommand
-syn keyword grubCommand	    contained bootp color device dhcp hide ifconfig pager
-syn keyword grubCommand	    contained partnew parttype password rarp serial setkey
-syn keyword grubCommand	    contained terminal tftpserver unhide blocklist boot cat
-syn keyword grubCommand	    contained chainloader cmp configfile debug displayapm
-syn keyword grubCommand	    contained displaymem embed find fstest geometry halt help
-syn keyword grubCommand	    contained impsprobe initrd install ioprobe kernel lock
-syn keyword grubCommand	    contained makeactive map md5crypt module modulenounzip pause
-syn keyword grubCommand	    contained quit reboot read root rootnoverify savedefault
-syn keyword grubCommand	    contained setup testload testvbe uppermem vbeprobe
 
-" colors
+syn keyword grubCommand       contained default fallback hiddenmenu timeout
-syn match   grubColor	    "\(blink-\)\=\(black\|blue\|green\|cyan\|red\|magenta\|brown\|yellow\|white\)"
+
-syn match   grubColor	    "\<\(blink-\)\=light-\(gray\|blue\|green\|cyan\|red\|magenta\)"
+syn keyword grubTitleCommand  contained title nextgroup=grubTitle skipwhite
-syn match   grubColor	    "\<\(blink-\)\=dark-gray"
+
+syn match   grubTitle         contained display '.*'
+
+syn keyword grubCommand       contained bootp color device dhcp hide ifconfig
+                              \ pager partnew parttype password rarp serial setkey
+                              \ terminal tftpserver unhide blocklist boot cat
+                              \ chainloader cmp configfile debug displayapm
+                              \ displaymem embed find fstest geometry halt help
+                              \ impsprobe initrd install ioprobe kernel lock
+                              \ makeactive map md5crypt module modulenounzip pause
+                              \ quit reboot read root rootnoverify savedefault setup
+                              \ testload testvbe uppermem vbeprobe
 
-" specials
 syn keyword grubSpecial       saved
 
-" Define the default highlighting.
+syn match   grubBlink         display 'blink-'
-" For version 5.7 and earlier: only when not done already
+syn keyword grubBlack         black
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+syn keyword grubBlue          blue
-if version >= 508 || !exists("did_grub_syn_inits")
+syn keyword grubGreen         green
-  if version < 508
+syn keyword grubRed           red
-    let did_grub_syn_inits = 1
+syn keyword grubMagenta       magenta
-    command -nargs=+ HiLink hi link <args>
+syn keyword grubBrown         brown yellow
-  else
+syn keyword grubWhite         white
-    command -nargs=+ HiLink hi def link <args>
+syn match   grubLightGray     display 'light-gray'
-  endif
+syn match   grubLightBlue     display 'light-blue'
+syn match   grubLightGreen    display 'light-green'
+syn match   grubLightCyan     display 'light-cyan'
+syn match   grubLightRed      display 'light-red'
+syn match   grubLightMagenta  display 'light-magenta'
+syn match   grubDarkGray      display 'dark-gray'
 
-  HiLink grubComment	Comment
+hi def link grubComment       Comment
-  HiLink grubTodo	Todo
+hi def link grubTodo          Todo
-  HiLink grubNumbers	Number
+hi def link grubNumbers       Number
-  HiLink grubDevice	Identifier
+hi def link grubDevice        Identifier
-  HiLink grubBlock	Identifier
+hi def link grubBlock         Identifier
-  HiLink grubCommand	Keyword
+hi def link grubCommand       Keyword
-  HiLink grubColor	Identifier
+hi def link grubTitleCommand  grubCommand
-  HiLink grubSpecial	Special
+hi def link grubTitle         String
-  delcommand HiLink
+hi def link grubSpecial       Special
-endif
+
+hi def      grubBlink         cterm=inverse
+hi def      grubBlack         ctermfg=Black ctermbg=White guifg=Black guibg=White
+hi def      grubBlue          ctermfg=DarkBlue guifg=DarkBlue
+hi def      grubGreen         ctermfg=DarkGreen guifg=DarkGreen
+hi def      grubRed           ctermfg=DarkRed guifg=DarkRed
+hi def      grubMagenta       ctermfg=DarkMagenta guifg=DarkMagenta
+hi def      grubBrown         ctermfg=Brown guifg=Brown
+hi def      grubWhite         ctermfg=White ctermbg=Black guifg=White guibg=Black
+hi def      grubLightGray     ctermfg=LightGray guifg=LightGray
+hi def      grubLightBlue     ctermfg=LightBlue guifg=LightBlue
+hi def      grubLightGreen    ctermfg=LightGreen guifg=LightGreen
+hi def      grubLightCyan     ctermfg=LightCyan guifg=LightCyan
+hi def      grubLightRed      ctermfg=LightRed guifg=LightRed
+hi def      grubLightMagenta  ctermfg=LightMagenta guifg=LightMagenta
+hi def      grubDarkGray      ctermfg=DarkGray guifg=DarkGray
 
 let b:current_syntax = "grub"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/indent.vim

@@ -1,101 +1,178 @@
 " Vim syntax file
-" Language:	    indent RC File
+" Language:         indent(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/indent/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
+"   indent_is_bsd:  If exists, will change somewhat to match BSD implementation
-" arch-tag:	    23c11190-79fa-4493-9fc5-36435402a20d
+"
 " TODO: is the deny-all (a la lilo.vim nice or no?)...
 "       irritating to be wrong to the last char...
 "       would be sweet if right until one char fails
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
+let s:cpo_save = &cpo
-" For version 5.x: Set it globally
+set cpo&vim
-" For version 6.x: Set it locally
-if version >= 600
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk 48-57,65-90,97-122,-,_
-delcommand SetIsk
 
-" errors
+setlocal iskeyword=@,48-57,-,_
-syn match   indentError "\S\+"
+
+syn match   indentError   '\S\+'
 
-" todo
 syn keyword indentTodo    contained TODO FIXME XXX NOTE
 
-" comments
+syn region  indentComment matchgroup=indentComment
-syn region  indentComment matchgroup=indentComment start="/\*" end="\*/" contains=indentTodo
+                          \ start='/\*' end='\*/'
+                          \ contains=indentTodo,@Spell
+syn region  indentComment matchgroup=indentComment
+                          \ start='//' skip='\\$' end='$'
+                          \ contains=indentTodo,@Spell
 
-" keywords (command-line switches)
+syn keyword indentOptions -bacc --blank-lines-after-ifdefs
-syn match   indentOptions "\<--\(no-\)\=blank-\(before-sizeof\|Bill-Shannon\|lines-\(after-\(commas\|declarations\|procedures\)\|before-block-comments\)\)\>"
+                        \ -bad --blank-lines-after-declarations
-syn match   indentOptions "\<--brace-indent\s*\d\+\>"
+                        \ -badp --blank-lines-after-procedure-declarations
-syn match   indentOptions "\<--braces-\(after\|on\)-\(if\|struct-decl\)-line\>"
+                        \ -bap --blank-lines-after-procedures
-syn match   indentOptions "\<--break-\(\(after\|before\)-boolean-operator\|function-decl-args\)\>"
+                        \ -bbb --blank-lines-before-block-comments
-syn match   indentOptions "\<--\(case\(-brace\)\=\|comment\|continuation\|declaration\|line-comments\|parameter\|paren\|struct-brace\)-indentation\s*\d\+\>"
+                        \ -bbo --break-before-boolean-operator
-syn match   indentOptions "\<--\(no-\)\=comment-delimiters-on-blank-lines\>"
+                        \ -bc --blank-lines-after-commas
-syn match   indentOptions "\<--\(dont-\)\=cuddle-\(do-while\|else\)\>"
+                        \ -bfda --break-function-decl-args
-syn match   indentOptions "\<--\(declaration-comment\|else-endif\)-column\s*\d\+\>"
+                        \ -bfde --break-function-decl-args-end
-syn match   indentOptions "\<--dont-break-\(function-decl-args\|procedure-type\)\>"
+                        \ -bl --braces-after-if-line
-syn match   indentOptions "\<--\(dont-\)\=\(format\(-first-column\)\=\|star\)-comments\>"
+                        \ -blf --braces-after-func-def-line
-syn match   indentOptions "\<--\(honour\|ignore\)-newlines\>"
+                        \ -bls --braces-after-struct-decl-line
-syn match   indentOptions "\<--\(indent-level\|\(comment-\)\=line-length\)\s*\d\+\>"
+                        \ -br --braces-on-if-line
-syn match   indentOptions "\<--\(leave\|remove\)-preprocessor-space\>"
+                        \ -brf --braces-on-func-def-line
-"not 100%, since casts\= should always be cast if no- isn't given
+                        \ -brs --braces-on-struct-decl-line
-syn match   indentOptions "\<--\(no-\)\=space-after-\(parentheses\|casts\=\|for\|if\|while\)\>"
+                        \ -bs --Bill-Shannon
-syn match   indentOptions "\<--\(dont-\)\=space-special-semicolon\>"
+                        \ -bs --blank-before-sizeof
-syn match   indentOptions "\<--\(leave\|swallow\)-optional-blank-lines\>"
+                        \ -c++ --c-plus-plus
-syn match   indentOptions "\<--tab-size\s*\d\+\>"
+                        \ -cdb --comment-delimiters-on-blank-lines
-syn match   indentOptions "\<--\(no\|use\)-tabs\>"
+                        \ -cdw --cuddle-do-while
-syn keyword indentOptions --gnu-style --ignore-profile --k-and-r-style --original
+                        \ -ce --cuddle-else
-syn keyword indentOptions --preserve-mtime --no-verbosity --verbose --output-file
+                        \ -cs --space-after-cast
-syn keyword indentOptions --no-parameter-indentation --procnames-start-lines
+                        \ -dj --left-justify-declarations
-syn keyword indentOptions --standard-output --start-left-side-of-comments
+                        \ -eei --extra-expression-indentation
-syn keyword indentOptions --space-after-procedure-calls
+                        \ -fc1 --format-first-column-comments
-" this also here since the gnu indent fellas aren't consistent. (ever read
+                        \ -fca --format-all-comments
-" the code to `indent'? you'll know what i mean if you have)
+                        \ -gnu --gnu-style
-syn match   indentOptions "\<-\(bli\|cbi\|cd\|ci\|cli\|c\|cp\|di\|d\|i\|ip\|l\|lc\|pi\|sbi\|ts\)\s*\d\+\>"
+                        \ -h --help
-syn match   indentOptions "\<-T\s\+\w\+\>"
+                        \ -h --usage
-syn keyword indentOptions --format-all-comments --continue-at-parentheses --dont-line-up-parentheses
+                        \ -hnl --honour-newlines
-syn keyword indentOptions --no-space-after-function-call-names
+                        \ -kr --k-and-r-style
-syn keyword indentOptions -bad -bap -bbb -bbo -bc -bfda -bl -br -bs -nbs -cdb -cdw -ce -cs -dce -fc1 -fca
+                        \ -kr --kernighan-and-ritchie
-syn keyword indentOptions -gnu -hnl -kr -lp -lps -nbad -nbap -nbbb -nbbo -nbc -nbfda -ncdb -ncdw -nprs
+                        \ -kr --kernighan-and-ritchie-style
-syn keyword indentOptions -nce -ncs -nfc1 -nfca -nhnl -nip -nlp -nlps -npcs -npmt -npro -npsl -nsaf -nsai
+                        \ -lp --continue-at-parentheses
-syn keyword indentOptions -nsaw -nsc -nsob -nss -nv -o -orig -pcs -pmt -prs -psl -saf -sai -saw -sc
+                        \ -lps --leave-preprocessor-space
-syn keyword indentOptions -sob -ss -st -v -version -bls -brs -ut -nut
+                        \ -nbacc --no-blank-lines-after-ifdefs
+                        \ -nbad --no-blank-lines-after-declarations
+                        \ -nbadp --no-blank-lines-after-procedure-declarations
+                        \ -nbap --no-blank-lines-after-procedures
+                        \ -nbbb --no-blank-lines-before-block-comments
+                        \ -nbbo --break-after-boolean-operator
+                        \ -nbc --no-blank-lines-after-commas
+                        \ -nbfda --dont-break-function-decl-args
+                        \ -nbfde --dont-break-function-decl-args-end
+                        \ -nbs --no-Bill-Shannon
+                        \ -nbs --no-blank-before-sizeof
+                        \ -ncdb --no-comment-delimiters-on-blank-lines
+                        \ -ncdw --dont-cuddle-do-while
+                        \ -nce --dont-cuddle-else
+                        \ -ncs --no-space-after-casts
+                        \ -ndj --dont-left-justify-declarations
+                        \ -neei --no-extra-expression-indentation
+                        \ -nfc1 --dont-format-first-column-comments
+                        \ -nfca --dont-format-comments
+                        \ -nhnl --ignore-newlines
+                        \ -nip --dont-indent-parameters
+                        \ -nip --no-parameter-indentation
+                        \ -nlp --dont-line-up-parentheses
+                        \ -nlps --remove-preprocessor-space
+                        \ -npcs --no-space-after-function-call-names
+                        \ -npro --ignore-profile
+                        \ -nprs --no-space-after-parentheses
+                        \ -npsl --dont-break-procedure-type
+                        \ -nsaf --no-space-after-for
+                        \ -nsai --no-space-after-if
+                        \ -nsaw --no-space-after-while
+                        \ -nsc --dont-star-comments
+                        \ -nsob --leave-optional-blank-lines
+                        \ -nss --dont-space-special-semicolon
+                        \ -nut --no-tabs
+                        \ -nv --no-verbosity
+                        \ -o --output
+                        \ -o --output-file
+                        \ -orig --berkeley
+                        \ -orig --berkeley-style
+                        \ -orig --original
+                        \ -orig --original-style
+                        \ -pcs --space-after-procedure-calls
+                        \ -pmt --preserve-mtime
+                        \ -prs --space-after-parentheses
+                        \ -psl --procnames-start-lines
+                        \ -saf --space-after-for
+                        \ -sai --space-after-if
+                        \ -saw --space-after-while
+                        \ -sc --start-left-side-of-comments
+                        \ -sob --swallow-optional-blank-lines
+                        \ -ss --space-special-semicolon
+                        \ -st --standard-output
+                        \ -ut --use-tabs
+                        \ -v --verbose
+                        \ -version --version
 
-if exists("indent_minlines")
+syn keyword indentOptions -bli --brace-indent
-    let b:indent_minlines = indent_minlines
+                        \ -c --comment-indentation
+                        \ -bli --brace-indent
+                        \ -c --comment-indentation
+                        \ -cbi --case-brace-indentation
+                        \ -cd --declaration-comment-column
+                        \ -ci --continuation-indentation
+                        \ -cli --case-indentation
+                        \ -cp --else-endif-column
+                        \ -d --line-comments-indentation
+                        \ -di --declaration-indentation
+                        \ -i --indent-level
+                        \ -ip --parameter-indentation
+                        \ -l --line-length
+                        \ -lc --comment-line-length
+                        \ -pi --paren-indentation
+                        \ -ppi --preprocessor-indentation
+                        \ -sbi --struct-brace-indentation
+                        \ -ts --tab-size
+                        \ nextgroup=indenNumber skipwhite
+if !exists("indent_is_bsd")
+  syn keyword indentOptions -i --indentation-level
+                          \ nextgroup=indentNumber skipwhite
+endif
+
+syn match   indentNumber  display '\<\d\+\>'
+
+syn keyword indentOptions -T nextgroup=indentIdent skipwhite
+
+syn match   indentIdent   display '\<\h\w*\>'
+
+if exists("indent_is_bsd")
+  syn keyword indentOptions -ip -nip -dj -ndj -ei -nei
+endif
+
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
 else
-    let b:indent_minlines = 50
+  if !exists("c_no_if0")
-endif
+    let b:c_minlines = 50       " #if 0 constructs can be long
-exec "syn sync minlines=" . b:indent_minlines
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_indent_syn_inits")
-  if version < 508
-    let did_indent_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
   else
-    command -nargs=+ HiLink hi def link <args>
+    let b:c_minlines = 15       " mostly for () constructs
   endif
-
-  HiLink indentError	Error
-  HiLink indentComment	Comment
-  HiLink indentTodo	Todo
-  HiLink indentOptions	Keyword
-  delcommand HiLink
 endif
 
+hi def link indentError   Error
+hi def link indentComment Comment
+hi def link indentTodo    Todo
+hi def link indentOptions Keyword
+hi def link indentNumber  Number
+hi def link indentIdent   Identifier
+
 let b:current_syntax = "indent"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/ld.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         ld(1) script
 " Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision:  2005-06-28
+" Latest Revision:  2005-06-29
 
 if exists("b:current_syntax")
   finish
@@ -16,7 +16,7 @@ syn region  ldComment       start='/\*' end='\*/' contains=ldTodo,@Spell
 
 syn region  ldFileName      start=+"+ end=+"+
 
-syn keyword ldPreProc       SECTIONS MEMORY OVERLAY PHDRS VERSION
+syn keyword ldPreProc       SECTIONS MEMORY OVERLAY PHDRS VERSION INCLUDE
 syn match   ldPreProc       '\<VERS_\d\+\.\d\+'
 
 syn keyword ldFunction      ABSOLUTE ADDR ALIGN BLOCK DATA_SEGMENT_ALIGN
@@ -24,7 +24,7 @@ syn keyword ldFunction      ABSOLUTE ADDR ALIGN BLOCK DATA_SEGMENT_ALIGN
                             \ LOADADDR MAX MIN NEXT SIZEOF SIZEOF_HEADERS
                             \ sizeof_headers
 
-syn keyword ldKeyword       ENTRY INCLUDE INPUT GROUP OUTPUT
+syn keyword ldKeyword       ENTRY INPUT GROUP OUTPUT
                             \ SEARCH_DIR STARTUP OUTPUT_FORMAT TARGET
                             \ ASSERT EXTERN FORCE_COMMON_ALLOCATION
                             \ INHIBIT_COMMON_ALLOCATION NOCROSSREFS OUTPUT_ARCH

runtime/syntax/lftp.vim

@@ -1,58 +1,45 @@
 " Vim syntax file
 " Language:         lftp(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/lftp/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-22
-" arch-tag:	    f2537c49-5d64-42b8-beb4-13a09dd723d2
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
+let s:cpo_save = &cpo
-" For version 5.x: Set it globally
+set cpo&vim
-" For version 6.x: Set it locally
-if version >= 600
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk 48-57,97-122,-
-delcommand SetIsk
 
-" comments
+setlocal iskeyword=@,48-57,-
-syn region  lftpComment		display oneline matchgroup=lftpComment start="#" end="$" contains=lftpTodo
+
+syn region  lftpComment         display oneline matchgroup=lftpComment
+                                \ start='#' end='$' contains=lftpTodo,@Spell
 
-" todo
 syn keyword lftpTodo            contained TODO FIXME XXX NOTE
 
-" strings
+syn region  lftpString          contained display
-syn region  lftpString		contained display start=+"+ skip=+\\$\|\\"+ end=+"+ end=+$+
+                                \ start=+"+ skip=+\\$\|\\"+ end=+"+ end=+$+
 
-" numbers
+syn match   lftpNumber          contained display '\<\d\+\(\.\d\+\)\=\>'
-syn match   lftpNumber		contained display "\<\d\+\(\.\d\+\)\=\>"
 
-" booleans and other things
 syn keyword lftpBoolean         contained yes no on off true false
 
-" intervals
 syn keyword lftpInterval        contained infinity inf never forever
-syn match   lftpInterval	contained "\<\(\d\+\(\.\d\+\)\=[dhms]\)\+\>"
+syn match   lftpInterval        contained '\<\(\d\+\(\.\d\+\)\=[dhms]\)\+\>'
 
-" commands
 syn keyword lftpKeywords        alias anon at bookmark cache cat cd chmod close
-syn keyword lftpKeywords	cls command debug du echo exit fg find get get1
+                                \ cls command debug du echo exit fg find get
-syn keyword lftpKeywords	glob help history jobs kill lcd lftp lpwd ls
+                                \ get1 glob help history jobs kill lcd lftp
-syn keyword lftpKeywords	mget mirror mkdir module
+                                \ lpwd ls mget mirror mkdir module more mput
-syn keyword lftpKeywords	more mput mrm mv nlist open pget put pwd queue
+                                \ mrm mv nlist open pget put pwd queue quote
-syn keyword lftpKeywords	quote reget recls rels renlist repeat
+                                \ reget recls rels renlist repeat reput rm
-syn keyword lftpKeywords	reput rm rmdir scache site source suspend user
+                                \ rmdir scache site source suspend user version
-syn keyword lftpKeywords	version wait zcat zmore
+                                \ wait zcat zmore
 
-" settings
+syn region  lftpSet             matchgroup=lftpKeywords
-syn region  lftpSet		matchgroup=lftpKeywords start="set" end=";" end="$" contains=lftpString,lftpNumber,lftpBoolean,lftpInterval,lftpSettingsPrefix,lftpSettings
+                                \ start="set" end=";" end="$"
+                                \ contains=lftpString,lftpNumber,lftpBoolean,
+                                \ lftpInterval,lftpSettingsPrefix,lftpSettings
 syn match   lftpSettingsPrefix  contained '\<\%(bmk\|cache\|cmd\|color\|dns\):'
 syn match   lftpSettingsPrefix  contained '\<\%(file\|fish\|ftp\|hftp\):'
 syn match   lftpSettingsPrefix  contained '\<\%(http\|https\|mirror\|module\):'
@@ -61,124 +48,105 @@ syn match   lftpSettingsPrefix	contained '\<\%(net\|sftp\|ssl\|xfer\):'
 syn keyword lftpSettings        contained save-p[asswords]
 " cache:
 syn keyword lftpSettings        contained cache-em[pty-listings] en[able]
-syn keyword lftpSettings	contained exp[ire] siz[e]
+                                \ exp[ire] siz[e]
 " cmd:
 syn keyword lftpSettings        contained at[-exit] cls-c[ompletion-default]
-syn keyword lftpSettings	contained cls-d[efault] cs[h-history]
+                                \ cls-d[efault] cs[h-history]
-syn keyword lftpSettings	contained default-p[rotocol] default-t[itle]
+                                \ default-p[rotocol] default-t[itle]
 syn keyword lftpSettings        contained fai[l-exit] in[teractive]
-syn keyword lftpSettings	contained lo[ng-running] ls[-default]
+                                \ lo[ng-running] ls[-default] mo[ve-background]
-syn keyword lftpSettings	contained mo[ve-background] prom[pt]
+                                \ prom[pt]
-syn keyword lftpSettings	contained rem[ote-completion]
+                                \ rem[ote-completion]
-syn keyword lftpSettings	contained save-c[wd-history] save-r[l-history]
+                                \ save-c[wd-history] save-r[l-history]
-syn keyword lftpSettings	contained set-t[erm-status] statu[s-interval]
+                                \ set-t[erm-status] statu[s-interval]
-syn keyword lftpSettings	contained te[rm-status] verb[ose] verify-h[ost]
+                                \ te[rm-status] verb[ose] verify-h[ost]
-syn keyword lftpSettings	contained verify-path verify-path[-cached]
+                                \ verify-path verify-path[-cached]
 " color:
 syn keyword lftpSettings        contained dir[-colors] use-c[olor]
 " dns:
 syn keyword lftpSettings        contained S[RV-query] cache-en[able]
-syn keyword lftpSettings	contained cache-ex[pire] cache-s[ize]
+                                \ cache-ex[pire] cache-s[ize]
-syn keyword lftpSettings	contained fat[al-timeout] o[rder] use-fo[rk]
+                                \ fat[al-timeout] o[rder] use-fo[rk]
 " file:
 syn keyword lftpSettings        contained ch[arset]
 " fish:
 syn keyword lftpSettings        contained connect[-program] sh[ell]
 " ftp:
 syn keyword lftpSettings        contained acct anon-p[ass] anon-u[ser]
-syn keyword lftpSettings	contained au[to-sync-mode] b[ind-data-socket]
+                                \ au[to-sync-mode] b[ind-data-socket]
-syn keyword lftpSettings	contained ch[arset] cli[ent] dev[ice-prefix]
+                                \ ch[arset] cli[ent] dev[ice-prefix]
-syn keyword lftpSettings	contained fi[x-pasv-address] fxp-f[orce]
+                                \ fi[x-pasv-address] fxp-f[orce]
-syn keyword lftpSettings	contained fxp-p[assive-source] h[ome] la[ng]
+                                \ fxp-p[assive-source] h[ome] la[ng]
-syn keyword lftpSettings	contained list-e[mpty-ok] list-o[ptions]
+                                \ list-e[mpty-ok] list-o[ptions]
-syn keyword lftpSettings	contained nop[-interval] pas[sive-mode]
+                                \ nop[-interval] pas[sive-mode]
-syn keyword lftpSettings	contained port-i[pv4] port-r[ange] prox[y]
+                                \ port-i[pv4] port-r[ange] prox[y]
-syn keyword lftpSettings	contained rest-l[ist] rest-s[tor]
+                                \ rest-l[ist] rest-s[tor]
-syn keyword lftpSettings	contained retry-530 retry-530[-anonymous]
+                                \ retry-530 retry-530[-anonymous]
-syn keyword lftpSettings	contained sit[e-group] skey-a[llow]
+                                \ sit[e-group] skey-a[llow]
-syn keyword lftpSettings	contained skey-f[orce] ssl-allow
+                                \ skey-f[orce] ssl-allow
-syn keyword lftpSettings	contained ssl-allow[-anonymous] ssl-au[th]
+                                \ ssl-allow[-anonymous] ssl-au[th]
-syn keyword lftpSettings	contained ssl-f[orce] ssl-protect-d[ata]
+                                \ ssl-f[orce] ssl-protect-d[ata]
-syn keyword lftpSettings	contained ssl-protect-l[ist] stat-[interval]
+                                \ ssl-protect-l[ist] stat-[interval]
-syn keyword lftpSettings	contained sy[nc-mode] timez[one] use-a[bor]
+                                \ sy[nc-mode] timez[one] use-a[bor]
-syn keyword lftpSettings	contained use-fe[at] use-fx[p] use-hf[tp]
+                                \ use-fe[at] use-fx[p] use-hf[tp]
-syn keyword lftpSettings	contained use-mdtm use-mdtm[-overloaded]
+                                \ use-mdtm use-mdtm[-overloaded]
-syn keyword lftpSettings	contained use-ml[sd] use-p[ret] use-q[uit]
+                                \ use-ml[sd] use-p[ret] use-q[uit]
-syn keyword lftpSettings	contained use-site-c[hmod] use-site-i[dle]
+                                \ use-site-c[hmod] use-site-i[dle]
-syn keyword lftpSettings	contained use-site-u[time] use-siz[e]
+                                \ use-site-u[time] use-siz[e]
-syn keyword lftpSettings	contained use-st[at] use-te[lnet-iac]
+                                \ use-st[at] use-te[lnet-iac]
-syn keyword lftpSettings	contained verify-a[ddress] verify-p[ort]
+                                \ verify-a[ddress] verify-p[ort]
-syn keyword lftpSettings	contained w[eb-mode]
+                                \ w[eb-mode]
 " hftp:
 syn keyword lftpSettings        contained w[eb-mode] cache prox[y]
-syn keyword lftpSettings	contained use-au[thorization] use-he[ad]
+                                \ use-au[thorization] use-he[ad] use-ty[pe]
-syn keyword lftpSettings	contained use-ty[pe]
 " http:
 syn keyword lftpSettings        contained accept accept-c[harset]
-syn keyword lftpSettings	contained accept-l[anguage] cache coo[kie]
+                                \ accept-l[anguage] cache coo[kie]
-syn keyword lftpSettings	contained pos[t-content-type] prox[y]
+                                \ pos[t-content-type] prox[y]
-syn keyword lftpSettings	contained put-c[ontent-type] put-m[ethod]
+                                \ put-c[ontent-type] put-m[ethod] ref[erer]
-syn keyword lftpSettings	contained ref[erer] set-c[ookies] user[-agent]
+                                \ set-c[ookies] user[-agent]
 " https:
 syn keyword lftpSettings        contained prox[y]
 " mirror:
 syn keyword lftpSettings        contained exc[lude-regex] o[rder]
-syn keyword lftpSettings	contained parallel-d[irectories]
+                                \ parallel-d[irectories]
-syn keyword lftpSettings	contained parallel-t[ransfer-count]
+                                \ parallel-t[ransfer-count] use-p[get-n]
-syn keyword lftpSettings	contained use-p[get-n]
 " module:
 syn keyword lftpSettings        contained pat[h]
 " net:
 syn keyword lftpSettings        contained connection-l[imit]
-syn keyword lftpSettings	contained connection-t[akeover]
+                                \ connection-t[akeover] id[le] limit-m[ax]
-syn keyword lftpSettings	contained id[le] limit-m[ax] limit-r[ate]
+                                \ limit-r[ate] limit-total-m[ax]
-syn keyword lftpSettings	contained limit-total-m[ax] limit-total-r[ate]
+                                \ limit-total-r[ate] max-ret[ries] no-[proxy]
-syn keyword lftpSettings	contained max-ret[ries] no-[proxy]
+                                \ pe[rsist-retries] reconnect-interval-b[ase]
-syn keyword lftpSettings	contained pe[rsist-retries]
+                                \ reconnect-interval-ma[x]
-syn keyword lftpSettings	contained reconnect-interval-b[ase]
+                                \ reconnect-interval-mu[ltiplier]
-syn keyword lftpSettings	contained reconnect-interval-ma[x]
+                                \ socket-bind-ipv4 socket-bind-ipv6
-syn keyword lftpSettings	contained reconnect-interval-mu[ltiplier]
+                                \ socket-bu[ffer] socket-m[axseg] timeo[ut]
-syn keyword lftpSettings	contained socket-bind-ipv4 socket-bind-ipv6
-syn keyword lftpSettings	contained socket-bu[ffer] socket-m[axseg]
-syn keyword lftpSettings	contained timeo[ut]
 " sftp:
 syn keyword lftpSettings        contained connect[-program]
-syn keyword lftpSettings	contained max-p[ackets-in-flight]
+                                \ max-p[ackets-in-flight] prot[ocol-version]
-syn keyword lftpSettings	contained prot[ocol-version] ser[ver-program]
+                                \ ser[ver-program] size-r[ead] size-w[rite]
-syn keyword lftpSettings	contained size-r[ead] size-w[rite]
 " ssl:
 syn keyword lftpSettings        contained ca-f[ile] ca-p[ath] ce[rt-file]
-syn keyword lftpSettings	contained crl-f[ile] crl-p[ath] k[ey-file]
+                                \ crl-f[ile] crl-p[ath] k[ey-file]
-syn keyword lftpSettings	contained verify-c[ertificate]
+                                \ verify-c[ertificate]
 " xfer:
 syn keyword lftpSettings        contained clo[bber] dis[k-full-fatal]
-syn keyword lftpSettings	contained eta-p[eriod] eta-t[erse]
+                                \ eta-p[eriod] eta-t[erse] mak[e-backup]
-syn keyword lftpSettings	contained mak[e-backup] max-red[irections]
+                                \ max-red[irections] ra[te-period]
-syn keyword lftpSettings	contained ra[te-period]
 
-" Define the default highlighting.
+hi def link lftpComment         Comment
-" For version 5.7 and earlier: only when not done already
+hi def link lftpTodo            Todo
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link lftpString          String
-if version >= 508 || !exists("did_lftp_syn_inits")
+hi def link lftpNumber          Number
-  if version < 508
+hi def link lftpBoolean         Boolean
-    let did_lftp_syn_inits = 1
+hi def link lftpInterval        Number
-    command -nargs=+ HiLink hi link <args>
+hi def link lftpKeywords        Keyword
-  else
+hi def link lftpSettingsPrefix  PreProc
-    command -nargs=+ HiLink hi def link <args>
+hi def link lftpSettings        Type
-  endif
-
-  HiLink lftpComment		Comment
-  HiLink lftpTodo		Todo
-  HiLink lftpString		String
-  HiLink lftpNumber		Number
-  HiLink lftpBoolean		Boolean
-  HiLink lftpInterval		Number
-  HiLink lftpKeywords		Keyword
-  HiLink lftpSettingsPrefix	PreProc
-  HiLink lftpSettings		Type
-  delcommand HiLink
-endif
 
 let b:current_syntax = "lftp"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/libao.vim

@@ -1,46 +1,27 @@
 " Vim syntax file
-" Language:	    libao configuration file
+" Language:         libao.conf(5) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/libao/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
-" arch-tag:	    4ddef0a8-6817-4555-a5a1-0be82094053d
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Todo
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword libaoTodo     contained TODO FIXME XXX NOTE
 
-" Comments
+syn region  libaoComment  matchgroup=libaoComment start='^\s*#' end='$'
-syn region  libaoComment    matchgroup=libaoComment start='^\s*#' end='$' contains=libaoTodo
+                          \ contains=libaoTodo,@Spell
 
-" Keywords
 syn keyword libaoKeyword  default_driver
 
-" Define the default highlighting.
+hi def link libaoTodo     Todo
-" For version 5.7 and earlier: only when not done already
+hi def link libaoComment  Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link libaoKeyword  Keyword
-if version >= 508 || !exists("did_libao_syn_inits")
-  if version < 508
-    let did_libao_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-    command -nargs=+ HiDef hi <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-    command -nargs=+ HiDef hi def <args>
-  endif
-
-  HiLink libaoTodo	Todo
-  HiLink libaoComment	Comment
-  HiLink libaoKeyword	Keyword
-
-  delcommand HiLink
-  delcommand HiDef
-endif
 
 let b:current_syntax = "libao"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/limits.vim

@@ -0,0 +1,44 @@
+" Vim syntax file
+" Language:         limits(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword limitsTodo    contained TODO FIXME XXX NOTE
+
+syn region  limitsComment display oneline start='^\s*#' end='$'
+                          \ contains=limitsTodo,@Spell
+
+syn match   limitsBegin   display '^'
+                          \ nextgroup=limitsUser,limitsDefault,limitsComment
+                          \ skipwhite
+
+syn match   limitsUser    contained '[^ \t#*]\+'
+                          \ nextgroup=limitsLimit,limitsDeLimit skipwhite
+
+syn match   limitsDefault contained '*'
+                          \ nextgroup=limitsLimit,limitsDeLimit skipwhite
+
+syn match   limitsLimit   contained '[ACDFMNRSTUKLP]' nextgroup=limitsNumber
+syn match   limitsDeLimit contained '-'
+
+syn match   limitsNumber  contained '\d\+\>' nextgroup=limitsLimit skipwhite
+
+hi def link limitsTodo    Todo
+hi def link limitsComment Comment
+hi def link limitsUser    Keyword
+hi def link limitsDefault Macro
+hi def link limitsLimit   Identifier
+hi def link limitsDeLimit Special
+hi def link limitsNumber  Number
+
+let b:current_syntax = "limits"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/loginaccess.vim

@@ -0,0 +1,96 @@
+" Vim syntax file
+" Language:         login.access(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword loginaccessTodo           contained TODO FIXME XXX NOTE
+
+syn region  loginaccessComment        display oneline start='^#' end='$'
+                                      \ contains=loginaccessTodo,@Spell
+
+syn match   loginaccessBegin          display '^'
+                                      \ nextgroup=loginaccessPermission,
+                                      \ loginaccessComment skipwhite
+
+syn match   loginaccessPermission     contained display '[^#]'
+                                      \ contains=loginaccessPermError
+                                      \ nextgroup=loginaccessUserSep
+
+syn match   loginaccessPermError      contained display '[^+-]'
+
+syn match   loginaccessUserSep        contained display ':'
+                                      \ nextgroup=loginaccessUsers,
+                                      \ loginaccessAllUsers,
+                                      \ loginaccessExceptUsers
+
+syn match   loginaccessUsers          contained display '[^, \t:]\+'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessAllUsers       contained display '\<ALL\>'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessLocalUsers     contained display '\<LOCAL\>'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessExceptUsers    contained display '\<EXCEPT\>'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessUserIntSep     contained display '[, \t]'
+                                      \ nextgroup=loginaccessUsers,
+                                      \ loginaccessAllUsers,
+                                      \ loginaccessExceptUsers
+
+syn match   loginaccessOriginSep      contained display ':'
+                                      \ nextgroup=loginaccessOrigins,
+                                      \ loginaccessAllOrigins,
+                                      \ loginaccessExceptOrigins
+
+syn match   loginaccessOrigins        contained display '[^, \t]\+'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessAllOrigins     contained display '\<ALL\>'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessLocalOrigins   contained display '\<LOCAL\>'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessExceptOrigins  contained display '\<EXCEPT\>'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessOriginIntSep   contained display '[, \t]'
+                                      \ nextgroup=loginaccessOrigins,
+                                      \ loginaccessAllOrigins,
+                                      \ loginaccessExceptOrigins
+
+hi def link loginaccessTodo           Todo
+hi def link loginaccessComment        Comment
+hi def link loginaccessPermission     Type
+hi def link loginaccessPermError      Error
+hi def link loginaccessUserSep        Delimiter
+hi def link loginaccessUsers          Identifier
+hi def link loginaccessAllUsers       Macro
+hi def link loginaccessLocalUsers     Macro
+hi def link loginaccessExceptUsers    Operator
+hi def link loginaccessUserIntSep     loginaccessUserSep
+hi def link loginaccessOriginSep      loginaccessUserSep
+hi def link loginaccessOrigins        Identifier
+hi def link loginaccessAllOrigins     Macro
+hi def link loginaccessLocalOrigins   Macro
+hi def link loginaccessExceptOrigins  loginaccessExceptUsers
+hi def link loginaccessOriginIntSep   loginaccessUserSep
+
+let b:current_syntax = "loginaccess"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/logindefs.vim

@@ -0,0 +1,94 @@
+" Vim syntax file
+" Language:         login.defs(5) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword logindefsTodo       contained TODO FIXME XXX NOTE
+
+syn region  logindefsComment    display oneline start='^\s*#' end='$'
+                                \ contains=logindefsTodo,@Spell
+
+syn match   logindefsString     contained '[[:graph:]]\+'
+
+syn match   logindefsPath       contained '[[:graph:]]\+'
+
+syn match   logindefsPaths      contained '[[:graph:]]\+'
+                                \ nextgroup=logindefsPathDelim
+
+syn match   logindefsPathDelim  contained ':' nextgroup=logindefsPaths
+
+syn keyword logindefsBoolean    contained yes no
+
+syn match   logindefsDecimal    contained '\<\d\+\>'
+
+syn match   logindefsOctal      contained display '\<0\o\+\>'
+                                \ contains=logindefsOctalZero
+syn match   logindefsOctalZero  contained display '\<0'
+syn match   logindefsOctalError contained display '\<0\o*[89]\d*\>'
+
+syn match   logindefsHex        contained display '\<0x\x\+\>'
+
+syn cluster logindefsNumber     contains=logindefsDecimal,logindefsOctal,
+                                \ logindefsOctalError,logindefsHex
+
+syn match   logindefsBegin      display '^'
+                                \ nextgroup=logindefsKeyword,logindefsComment
+                                \ skipwhite
+
+syn keyword logindefsKeyword    contained CHFN_AUTH CLOSE_SESSIONS CREATE_HOME
+                                \ DEFAULT_HOME FAILLOG_ENAB LASTLOG_ENAB
+                                \ LOG_OK_LOGINS LOG_UNKFAIL_ENAB MAIL_CHECK_ENAB
+                                \ MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB
+                                \ PASS_ALWAYS_WARN PORTTIME_CHECKS_ENAB
+                                \ QUOTAS_ENAB SU_WHEEL_ONLY SYSLOG_SG_ENAB
+                                \ SYSLOG_SU_ENAB USERGROUPS_ENAB
+                                \ nextgroup=logindefsBoolean skipwhite
+
+syn keyword logindefsKeyword    contained CHFN_RESTRICT CONSOLE CONSOLE_GROUPS
+                                \ ENV_TZ ENV_HZ FAKE_SHELL SU_NAME LOGIN_STRING
+                                \ NOLOGIN_STR TTYGROUP USERDEL_CMD
+                                \ nextgroup=logindefsString skipwhite
+
+syn keyword logindefsKeyword    contained ENVIRON_FILE FTMP_FILE HUSHLOGIN_FILE
+                                \ ISSUE_FILE MAIL_DIR MAIL_FILE NOLOGINS_FILE
+                                \ NOLOGINS_FILE TTYTYPE_FILE QMAIL_DIR
+                                \ SULOG_FILE
+                                \ nextgroup=logindefsPath skipwhite
+
+syn keyword logindefsKeyword    contained CRACKLIB_DICTPATH ENV_PATH
+                                \ ENV_ROOTPATH ENV_SUPATH MOTD_FILE
+                                \ nextgroup=logindefsPaths skipwhite
+
+syn keyword logindefsKeyword    contained ERASECHAR FAIL_DELAY GETPASS_ASTERISKS
+                                \ GID_MAX GID_MIN KILLCHAR LOGIN_RETRIES
+                                \ LOGIN_TIMEOUT PASS_CHANGE_TRIES PASS_MAX_DAYS
+                                \ PASS_MAX_LEN PASS_MIN_DAYS PASS_MIN_LEN
+                                \ PASS_WARN_AGE TTYPERM UID_MAX UID_MIN ULIMIT
+                                \ UMASK
+                                \ nextgroup=@logindefsNumber skipwhite
+
+hi def link logindefsTodo       Todo
+hi def link logindefsComment    Comment
+hi def link logindefsString     String
+hi def link logindefsPath       String
+hi def link logindefsPaths      logindefsPath
+hi def link logindefsPathDelim  Delimiter
+hi def link logindefsBoolean    Boolean
+hi def link logindefsDecimal    Number
+hi def link logindefsOctal      Number
+hi def link logindefsOctalZero  PreProc
+hi def link logindefsOctalError Error
+hi def link logindefsHex        Number
+hi def link logindefsKeyword    Keyword
+
+let b:current_syntax = "logindefs"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/modconf.vim

@@ -1,66 +1,44 @@
 " Vim syntax file
-" Language:	    Linux modutils modules.conf File
+" Language:         modules.conf(5) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/modconf/
+" Latest Revision:  2005-06-29
-" Latest Revision:  2004-05-22
-" arch-tag:	    b7981bdb-daa3-41d1-94b5-a3d60b627916
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" comments
+setlocal iskeyword=@,48-57,-
-syn region  modconfComment  start="#" skip="\\$" end="$" contains=modconfTodo
+
+let s:cpo_save = &cpo
+set cpo&vim
 
-" todo
 syn keyword modconfTodo         FIXME TODO XXX NOTE
 
-" keywords and similar
+syn region  modconfComment      start='#' skip='\\$' end='$'
-syn match   modconfBegin    "^" skipwhite nextgroup=modconfCommand,modconfComment
+                                \ contains=modconfTodo,@Spell
 
-syn match   modconfCommand  "\(add\s\+\)\=(above\|below\|probe\|probeall\}"
+syn keyword modconfConditional  if else elseif endif
-syn region  modconfCommand  transparent matchgroup=modconfCommand start="\(add\s\+\)\=options" skip="\\$" end="$" contains=modconfModOpt
-syn keyword modconfCommand  define remove keep install insmod_opt else endif
-syn keyword modconfCommand  nextgroup=modconfPath skipwhite alias depfile generic_stringfile pcimapfile include isapnpmapfile usbmapfile parportmapfile ieee1394mapfile pnpbiosmapfile persistdir prune
-syn match   modconfCommand  "path\(\[\w\+\]\)\=" nextgroup=modconfPath skipwhite
-syn region  modconfCommand  transparent matchgroup=modconfCommand start="^\s*\(if\|elseif\)" skip="\\$" end="$" contains=modconfOp
-syn region  modconfCommand  transparent matchgroup=modconfCommand start="^\s*\(post\|pre\)-\(install\|remove\)" skip="\\$" end="$"
 
+syn keyword modconfPreProc      alias define include keep prune
+                                \ post-install post-remove pre-install
+                                \ pre-remove persistdir
 
-" expressions and similay
+syn keyword modconfKeyword      add above below install options probe probeall
-syn match   modconfOp	    contained "\s-[fnk]\>"
+                                \ remove
-syn region  modconfPath	    contained start="\(=\@=\)\=/" skip="\\$" end="\\\@!\_s"
-syn match   modconfModOpt   contained "\<\w\+=\@="
 
-if exists("modconf_minlines")
+syn keyword modconfIdentifier   depfile insmod_opt path generic_stringfile
-    let b:modconf_minlines = modconf_minlines
+                                \ pcimapfile isapnpmapfile usbmapfile
-else
+                                \ parportmapfile ieee1394mapfile pnpbiosmapfile
-    let b:modconf_minlines = 50
+syn match   modconfIdentifier   'path\[[^]]\+\]'
-endif
-exec "syn sync minlines=" . b:modconf_minlines
 
-" Define the default highlighting.
+hi def link modconfTodo         Todo
-" For version 5.7 and earlier: only when not done already
+hi def link modconfComment      Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link modconfConditional  Conditional
-if version >= 508 || !exists("did_modconf_syn_inits")
+hi def link modconfPreProc      PreProc
-  if version < 508
+hi def link modconfKeyword      Keyword
-    let did_modconf_syn_inits = 1
+hi def link modconfIdentifier   Identifier
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink modconfComment Comment
-  HiLink modconfTodo	Todo
-  HiLink modconfCommand Keyword
-  HiLink modconfPath	String
-  HiLink modconfOp	Identifier
-  HiLink modconfModOpt  Identifier
-  delcommand HiLink
-endif
 
 let b:current_syntax = "modconf"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/syntax/mplayerconf.vim

@@ -1,111 +1,84 @@
 " Vim syntax file
 " Language:         mplayer(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/mplayerconf/
+" Latest Revision:  2005-06-27
-" Latest Revision:  2004-05-22
-" arch-tag:	    c20b9381-5858-4452-b866-54e2e1891229
 
-if version < 600
+if exists("b:current_syntax")
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
+let s:cpo_save = &cpo
-" For version 5.x: Set it globally
+set cpo&vim
-" For version 6.x: Set it locally
+
-if version >= 600
+setlocal iskeyword=@,48-57,-
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk @,48-57,-
-delcommand SetIsk
 
-" Todo
 syn keyword mplayerconfTodo     contained TODO FIXME XXX NOTE
 
-" Comments
+syn region mplayerconfComment   display matchgroup=mplayerconfComment
-syn region mplayerconfComment   display matchgroup=mplayerconfComment start='#' end='$' contains=mplayerconfTodo
+                                \ start='#' end='$'
+                                \ contains=mplayerconfTodo,@Spell
 
-" PreProc
 syn keyword mplayerconfPreProc  include
 
-" Booleans
 syn keyword mplayerconfBoolean  yes no
 
-" Numbers
 syn match   mplayerconfNumber   '\<\d\+\>'
 
-" Options
 syn keyword mplayerconfOption   hardframedrop nomouseinput bandwidth dumpstream
-syn keyword mplayerconfOption	rtsp-stream-over-tcp tv overlapsub sub-bg-alpha
+                                \ rtsp-stream-over-tcp tv overlapsub
-syn keyword mplayerconfOption	subfont-outline unicode format vo edl cookies
+                                \ sub-bg-alpha subfont-outline unicode format
-syn keyword mplayerconfOption	fps zrfd af-adv nosound audio-density
+                                \ vo edl cookies fps zrfd af-adv nosound
-syn keyword mplayerconfOption	passlogfile vobsuboutindex
+                                \ audio-density passlogfile vobsuboutindex autoq
-syn keyword mplayerconfOption   autoq autosync benchmark colorkey nocolorkey
+                                \ autosync benchmark colorkey nocolorkey edlout
-syn keyword mplayerconfOption   edlout enqueue fixed-vo framedrop h
+                                \ enqueue fixed-vo framedrop h identify input
-syn keyword mplayerconfOption   identify input lircconf list-options loop menu
+                                \ lircconf list-options loop menu menu-cfg
-syn keyword mplayerconfOption   menu-cfg menu-root nojoystick nolirc
+                                \ menu-root nojoystick nolirc nortc playlist
-syn keyword mplayerconfOption   nortc playlist quiet really-quiet shuffle skin
+                                \ quiet really-quiet shuffle skin slave
-syn keyword mplayerconfOption   slave softsleep speed sstep use-stdin aid alang
+                                \ softsleep speed sstep use-stdin aid alang
-syn keyword mplayerconfOption   audio-demuxer audiofile audiofile-cache
+                                \ audio-demuxer audiofile audiofile-cache
-syn keyword mplayerconfOption   cdrom-device cache cdda channels chapter
+                                \ cdrom-device cache cdda channels chapter
-syn keyword mplayerconfOption   cookies-file demuxer dumpaudio dumpfile
+                                \ cookies-file demuxer dumpaudio dumpfile
-syn keyword mplayerconfOption   dumpvideo dvbin dvd-device dvdangle forceidx
+                                \ dumpvideo dvbin dvd-device dvdangle forceidx
-syn keyword mplayerconfOption   frames hr-mp3-seek idx ipv4-only-proxy loadidx
+                                \ frames hr-mp3-seek idx ipv4-only-proxy
-syn keyword mplayerconfOption   mc mf ni nobps noextbased passwd prefer-ipv4
+                                \ loadidx mc mf ni nobps noextbased
-syn keyword mplayerconfOption   prefer-ipv6 rawaudio rawvideo
+                                \ passwd prefer-ipv4 prefer-ipv6 rawaudio
-syn keyword mplayerconfOption   saveidx sb srate ss tskeepbroken tsprog tsprobe
+                                \ rawvideo saveidx sb srate ss tskeepbroken
-syn keyword mplayerconfOption   user user-agent vid vivo dumpjacosub
+                                \ tsprog tsprobe user user-agent vid vivo
-syn keyword mplayerconfOption   dumpmicrodvdsub dumpmpsub dumpsami dumpsrtsub
+                                \ dumpjacosub dumpmicrodvdsub dumpmpsub dumpsami
-syn keyword mplayerconfOption   dumpsub ffactor flip-hebrew font forcedsubsonly
+                                \ dumpsrtsub dumpsub ffactor flip-hebrew font
-syn keyword mplayerconfOption   fribidi-charset ifo noautosub osdlevel
+                                \ forcedsubsonly fribidi-charset ifo noautosub
-syn keyword mplayerconfOption   sid slang spuaa spualign spugauss sub
+                                \ osdlevel sid slang spuaa spualign spugauss
-syn keyword mplayerconfOption   sub-bg-color sub-demuxer sub-fuzziness
+                                \ sub sub-bg-color sub-demuxer sub-fuzziness
-syn keyword mplayerconfOption   sub-no-text-pp subalign subcc subcp subdelay
+                                \ sub-no-text-pp subalign subcc subcp subdelay
-syn keyword mplayerconfOption   subfile subfont-autoscale subfont-blur
+                                \ subfile subfont-autoscale subfont-blur
-syn keyword mplayerconfOption   subfont-encoding subfont-osd-scale
+                                \ subfont-encoding subfont-osd-scale
-syn keyword mplayerconfOption   subfont-text-scale subfps subpos subwidth
+                                \ subfont-text-scale subfps subpos subwidth
-syn keyword mplayerconfOption   utf8 vobsub vobsubid abs ao aofile aop delay
+                                \ utf8 vobsub vobsubid abs ao aofile aop delay
-syn keyword mplayerconfOption   mixer nowaveheader aa bpp brightness contrast
+                                \ mixer nowaveheader aa bpp brightness contrast
-syn keyword mplayerconfOption   dfbopts display double dr dxr2 fb fbmode
+                                \ dfbopts display double dr dxr2 fb fbmode
-syn keyword mplayerconfOption   fbmodeconfig forcexv fs fsmode-dontuse fstype
+                                \ fbmodeconfig forcexv fs fsmode-dontuse fstype
-syn keyword mplayerconfOption   geometry guiwid hue jpeg monitor-dotclock
+                                \ geometry guiwid hue jpeg monitor-dotclock
-syn keyword mplayerconfOption   monitor-hfreq monitor-vfreq monitoraspect
+                                \ monitor-hfreq monitor-vfreq monitoraspect
-syn keyword mplayerconfOption   nograbpointer nokeepaspect noxv ontop panscan
+                                \ nograbpointer nokeepaspect noxv ontop panscan
-syn keyword mplayerconfOption   rootwin saturation screenw stop-xscreensaver vm
+                                \ rootwin saturation screenw stop-xscreensaver
-syn keyword mplayerconfOption   vsync wid xineramascreen z zrbw zrcrop zrdev
+                                \ vm vsync wid xineramascreen z zrbw zrcrop
-syn keyword mplayerconfOption   zrhelp zrnorm zrquality zrvdec zrxdoff ac af
+                                \ zrdev zrhelp zrnorm zrquality zrvdec zrxdoff
-syn keyword mplayerconfOption   afm aspect flip lavdopts noaspect noslices
+                                \ ac af afm aspect flip lavdopts noaspect
-syn keyword mplayerconfOption   novideo oldpp pp pphelp ssf stereo sws vc vfm x
+                                \ noslices novideo oldpp pp pphelp ssf stereo
-syn keyword mplayerconfOption   xvidopts xy y zoom vf vop audio-delay
+                                \ sws vc vfm x xvidopts xy y zoom vf vop
-syn keyword mplayerconfOption   audio-preload endpos ffourcc include info
+                                \ audio-delay audio-preload endpos ffourcc
-syn keyword mplayerconfOption   noautoexpand noskip o oac of ofps ovc
+                                \ include info noautoexpand noskip o oac of
-syn keyword mplayerconfOption   skiplimit v vobsubout vobsuboutid
+                                \ ofps ovc skiplimit v vobsubout vobsuboutid
-syn keyword mplayerconfOption   lameopts lavcopts nuvopts xvidencopts
+                                \ lameopts lavcopts nuvopts xvidencopts
 
-" Define the default highlighting.
+hi def link mplayerconfTodo     Todo
-" For version 5.7 and earlier: only when not done already
+hi def link mplayerconfComment  Comment
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+hi def link mplayerconfPreProc  PreProc
-if version >= 508 || !exists("did_mplayer_syn_inits")
+hi def link mplayerconfBoolean  Boolean
-  if version < 508
+hi def link mplayerconfNumber   Number
-    let did_mplayer_syn_inits = 1
+hi def link mplayerconfOption   Keyword
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink mplayerconfTodo    Todo
-  HiLink mplayerconfComment Comment
-  HiLink mplayerconfPreProc PreProc
-  HiLink mplayerconfBoolean Boolean
-  HiLink mplayerconfNumber  Number
-  HiLink mplayerconfOption  Keyword
-
-  delcommand HiLink
-endif
 
 let b:current_syntax = "mplayerconf"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save