updated for version 7.0099

2026-01-06 14:28:16 +00:00 · 2005-07-01 22:41:52 +00:00 · 2005-07-01 22:38:32 +00:00 · 2005-07-01 22:33:52 +00:00 · 2005-07-01 22:31:55 +00:00 · 2005-06-30 22:06:41 +00:00
197 changed files with 13695 additions and 7056 deletions
--- a/runtime/compiler/bdf.vim
+++ b/runtime/compiler/bdf.vim
@@ -1,16 +1,14 @@
 " Vim compiler file
-" Compiler:	    BDF to PCF Conversion
-" Maintainer:	    Nikolai Weibull <sourc@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/compiler/pcp/bdf/
-" Latest Revision:  2004-05-22
-" arch-tag:	    2e2f3a55-199b-468c-aa2e-d6b1a7b87806
+" Compiler:         BDF to PCF Conversion
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

 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:
--- a/runtime/compiler/gcc.vim
+++ b/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
--- a/runtime/compiler/rst.vim
+++ b/runtime/compiler/rst.vim
@@ -1,16 +1,14 @@
 " Vim compiler file
-" Compiler:	    reStructuredText Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/compiler/pcp/rst/
-" Latest Revision:  2004-05-22
-" arch-tag:	    ac64a95a-5d45-493d-a9f9-f96fc8568657
+" Compiler:         reStructuredText Documentation Format
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

 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:
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 25
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -36,7 +36,7 @@ done, the features in this document are not available.  See |+eval| and

 1.1 Variable types ~
 							*E712*
-There are four types of variables:
+There are five types of variables:

 Number		A 32 bit signed number.
 		Examples:  -123  0x10  0177
@@ -50,6 +50,10 @@ Funcref		A reference to a function |Funcref|.
 List		An ordered sequence of items |List|.
 		Example: [1, 2, ['a', 'b']]

+Dictionary	An associative, unordered array: Each entry has a key and a
+		value. |Dictionary|
+		Example: {'blue': "#0000ff", 'red': "#ff0000"}
+
 The Number and String types are converted automatically, depending on how they
 are used.

@@ -1143,10 +1147,10 @@ v:beval_lnum	The number of the line, over which the mouse pointer is. Only
 		valid while evaluating the 'balloonexpr' option.

 					*v:beval_text* *beval_text-variable*
-v:beval_text	The text under or after the mouse pointer.  Usually a word as it is
-		useful for debugging a C program.  'iskeyword' applies, but a
-		dot and "->" before the position is included.  When on a ']'
-		the text before it is used, including the matching '[' and
+v:beval_text	The text under or after the mouse pointer.  Usually a word as
+		it is useful for debugging a C program.  'iskeyword' applies,
+		but a dot and "->" before the position is included.  When on a
+		']' the text before it is used, including the matching '[' and
 		word before it.  When on a Visual area within one line the
 		highlighted text is used.
 		Only valid while evaluating the 'balloonexpr' option.
@@ -1603,6 +1607,7 @@ setreg( {n}, {v}[, {opt}])	Number	set register to value and type
 setwinvar( {nr}, {varname}, {val})	set {varname} in window {nr} to {val}
 simplify( {filename})		String	simplify filename as much as possible
 sort( {list} [, {func}])	List	sort {list}, using {func} to compare
+soundfold( {word})		String	sound-fold {word}
 spellbadword()			String	badly spelled word at cursor
 spellsuggest({word} [, {max}])	List	spelling suggestions
 split( {expr} [, {pat} [, {keepempty}]])
@@ -2376,6 +2381,17 @@ function({name})					*function()* *E700*
 		{name} can be a user defined function or an internal function.


+garbagecollect()					*garbagecollect()*
+		Cleanup unused Lists and Dictionaries that have circular
+		references.  There is hardly ever a need to invoke this
+		function, as it is automatically done when Vim runs out of
+		memory or is waiting for the user to press a key after
+		'updatetime'.  Items without circular references are always
+		freed when they become unused.
+		This is useful if you have deleted a very big List and/or
+		Dictionary with circular references in a script that runs for
+		a long time.
+
 get({list}, {idx} [, {default}])			*get()*
 		Get item {idx} from List {list}.  When this item is not
 		available return {default}.  Return zero when {default} is
@@ -3761,6 +3777,15 @@ sort({list} [, {func}])					*sort()* *E702*
 			let sortedlist = sort(mylist, "MyCompare")
 <

+							*soundfold()*
+soundfold({word})
+		Return the sound-folded equivalent of {word}.  Uses the first
+		language in 'spellang' for the current window that supports
+		soundfolding.  'spell' must be set.  When no sound folding is
+		possible the {word} is returned unmodified.
+		This can be used for making spelling suggestions.  Note that
+		the method can be quite slow.
+
 							*spellbadword()*
 spellbadword()	Return the badly spelled word under or after the cursor.
 		The cursor is advanced to the start of the bad word.
@@ -3783,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
-		used.
+		'spell' option must be set and the values of 'spelllang' and
+		'spellsuggest' are used.


 split({expr} [, {pattern} [, {keepempty}]])			*split()*
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2005 Jun 23
+*index.txt*     For Vim version 7.0aa.  Last change: 2005 Jun 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1359,6 +1359,7 @@ The commands are sorted on the non-optional part of their name.
 |:source|	:so[urce]	read Vim or Ex commands from a file
 |:spelldump|	:spelld[ump]	split window and fill with all correct words
 |:spellgood|	:spe[llgood]	add good word for spelling
+|:spellrepall|	:spellr[epall]	replace all bad words like last |z?|
 |:spellwrong|	:spellw[rong]	add spelling mistake
 |:split|	:sp[lit]	split current window
 |:sprevious|	:spr[evious]	split window and go to previous file in the
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 24
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 30


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1443,7 +1443,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|fold-marker|.

 			*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
-'compatible' 'cp'	boolean	(default on, off when a .vimrc file is found)
+'compatible' 'cp'	boolean	(default on, off when a .vimrc or .gvimrc file
+								is found)
 			global
 			{not in Vi}
 	This option has the effect of making Vim either more Vi-compatible, or
@@ -1458,12 +1459,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	options.  This default was chosen for those people who want to use Vim
 	just like Vi, and don't even (want to) know about the 'compatible'
 	option.
-	When a ".vimrc" file is found while Vim is starting up, this option is
-	switched off, and all options that have not been modified will be set
-	to the Vim defaults.  Effectively, this means that when a ".vimrc"
-	file exists, Vim will use the Vim defaults, otherwise it will use the
-	Vi defaults.  (Note: This doesn't happen for the system-wide vimrc
-	file).  Also see |compatible-default| and |posix-compliance|.
+	When a ".vimrc" or ".gvimrc" file is found while Vim is starting up,
+	this option is switched off, and all options that have not been
+	modified will be set to the Vim defaults.  Effectively, this means
+	that when a ".vimrc" or ".gvimrc" file exists, Vim will use the Vim
+	defaults, otherwise it will use the Vi defaults.  (Note: This doesn't
+	happen for the system-wide vimrc or gvimrc file).  Also see
+	|compatible-default| and |posix-compliance|.
 	You can also set this option with the "-C" argument, and reset it with
 	"-N".  See |-C| and |-N|.
 	Switching this option off makes the Vim defaults be used for options
@@ -5686,17 +5688,55 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{not available when compiled without the |+syntax|
 			feature}
-	Method used for spelling suggestions |z?|.  Can be one of these
-	values:
+	Methods used for spelling suggestions.  Both for the |z?| command and
+	the |spellsuggest()| function.  This is a comma-separated list of
+	items:

-	best		Method that works best for English.  Finds small
-			changes and uses some sound-a-like scoring.
-	double		Uses two methods and mixes the results.  The first
-			method is finding small changes, the other method
+	best		Internal method that works best for English.  Finds
+			changes like "fast" and uses a bit of sound-a-like
+			scoring to improve the ordering.
+
+	double		Internal method that uses two methods and mixes the
+			results.  The first method is "fast", the other method
 			computes how much the suggestion sounds like the bad
-			word.  Can be slow and doesn't always give better
-			results.
-	fast		Only check for small changes.
+			word.  That only works when the language specifies
+			sound folding.  Can be slow and doesn't always give
+			better results.
+
+	fast		Internal method that only checks for simple changes:
+			character inserts/deletes/swaps.  Works well for
+			simple typing mistakes.
+
+	file:{filename} Read file {filename}, which must have two columns,
+			separated by a slash.  The first column contains the
+			bad word, the second column the suggested good word.
+			Example:
+				theribal/terrible ~
+			Use this for common mistakes that do not appear at the
+			top of the suggestion list with the internal methods.
+			Lines without a slash are ignored, use this for
+			comments.
+			The file is used for all languages.
+
+	expr:{expr}	Evaluate expression {expr}.  Use a function to avoid
+			trouble with spaces.  |v:val| holds the badly spelled
+			word.  The expression must evaluate to a List of
+			Lists, each with a suggestion and a score.
+			Example:
+				[['the', 33], ['that', 44]]
+			Set 'verbose' and use |z?| to see the scores that the
+			internal methods use.  A lower score is better.
+			This may invoke |spellsuggest()| if you temporarily
+			set 'spellsuggest' to exclude the "expr:" part.
+			Errors are silently ignored, unless you set the
+			'verbose' option to a non-zero value.
+
+	Only one of "best", "double" or "fast" may be used.  The others may
+	appear several times in any order.  Example: >
+		:set sps=file:~/.vim/sugg,best,expr:MySuggest()
+<
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.


 			*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 25
+*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 26


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -579,6 +579,11 @@ It is only included when Vim was compiled with "huge" features.
 		this command.


+:profd[el] ...						*:profd* *:profdel*
+		Stop profiling for the arguments specified. See |:breakdel|
+		for the arguments.
+
+
 You must always start with a ":profile start fname" command.  The resulting
 file is written when Vim exits.  Here is an example of the output, with line
 numbers prepended for the explanation:
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 25
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 01


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7,8 +7,9 @@
 Spell checking						*spell*

 1. Quick start			|spell-quickstart|
-2. Generating a spell file	|spell-mkspell|
-3. Spell file format		|spell-file-format|
+2. Remarks on spell checking	|spell-remarks|
+3. Generating a spell file	|spell-mkspell|
+4. Spell file format		|spell-file-format|

 {Vi does not have any of these commands}

@@ -36,8 +37,6 @@ To search for the next misspelled word:
 							*]s* *E756*
 ]s			Move to next misspelled word after the cursor.
 			A count before the command can be used to repeat.
-			This uses the @Spell and @NoSpell clusters from syntax
-			highlighting, see |spell-syntax|.

 							*[s*
 [s			Like "]s" but search backwards, find the misspelled
@@ -60,40 +59,61 @@ zg			Add word under the cursor as a good word to
 			'spellfile'.  In Visual mode the selected characters
 			are added as a word (including white space!).

+							*zG*
+zG			Like "zg" but add the word to the internal word list.
+
 							*zw*
 zw			Add word under the cursor as a wrong (bad) word to
 			'spellfile'.  In Visual mode the selected characters
 			are added as a word (including white space!).

+							*zW*
+zW			Like "zw" but add the word to the internal word list.
+
 							*:spe* *:spellgood*
 :spe[llgood] {word}	Add [word} as a good word to 'spellfile'.

+:spe[llgood]! {word}	Add [word} as a good word to the internal word list.
+
 							*:spellw* *:spellwrong*
 :spellw[rong] {word}	Add [word} as a wrong (bad) word to 'spellfile'.

+:spellw[rong]! {word}	Add [word} as a wrong (bad) word to the internal word
+			list.
+
 After adding a word to 'spellfile' with the above commands its associated
-".spl" file will automatically be updated.  If you edit 'spellfile' manually
-you need to use the |:mkspell| command.  This sequence of commands mostly
-works well: >
+".spl" file will automatically be updated and reloaded.  If you change
+'spellfile' manually you need to use the |:mkspell| command.  This sequence of
+commands mostly works well: >
 	:exe 'e ' . &spellfile
 <	(make changes to the spell file) >
 	:mkspell! %

 More details about the 'spellfile' format below |spell-wordlist-format|.

+The internal word list is used for all buffers where 'spell' is set.  It is
+not stored, it is lost when you exit Vim.  It is also cleared when 'encoding'
+is set.
+

 Finding suggestions for bad words:
-
 							*z?*
 z?			For the word under/after the cursor suggest correctly
-			spelled words.  This also works to find alternative
-			for words that are not highlighted as bad words.
+			spelled words.  This also works to find alternatives
+			for a word that is not highlighted as a bad word,
+			e.g., when the word after it is bad.
 			The results are sorted on similarity to the word
 			under/after the cursor.
 			This may take a long time.  Hit CTRL-C when you are
 			bored.
+			This does not work when there is a line break halfway
+			a bad word (e.g., "the the").
 			You can enter the number of your choice or press
-			<Enter> if you don't want to replace.
+			<Enter> if you don't want to replace.  You can also
+			use the mouse to click on your choice (only works if
+			the mouse can be used in Normal mode and when there
+			are no line wraps).  Click on the first (header) line
+			to cancel.
 			If 'verbose' is non-zero a score will be displayed to
 			indicate the likeliness to the badly spelled word (the
 			higher the score the more different).
@@ -101,17 +121,23 @@ z?			For the word under/after the cursor suggest correctly
 			repeat the word replacement.  This works like "ciw",
 			the good word and <Esc>.

+					*:spellr* *:spellrepall* *E752* *E753*
+:spellr[epall]		Repeat the replacement done by |z?| for all matches
+			with the replaced word in the current window.
+
 The 'spellsuggest' option influences how the list of suggestions is generated
 and sorted.  See |'spellsuggest'|.

+==============================================================================
+2. Remarks on spell checking				*spell-remarks*

 PERFORMANCE

-Note that Vim does on-the-fly spell checking.  To make this work fast the
-word list is loaded in memory.  Thus this uses a lot of memory (1 Mbyte or
-more).  There might also be a noticeable delay when the word list is loaded,
-which happens when 'spell' is set and when 'spelllang' is set while 'spell'
-was already set.  Each word list is only loaded once, they are not deleted
+Vim does on-the-fly spell checking.  To make this work fast the word list is
+loaded in memory.  Thus this uses a lot of memory (1 Mbyte or more).  There
+might also be a noticeable delay when the word list is loaded, which happens
+when 'spell' is set and when 'spelllang' is set while 'spell' was already set.
+To minimize the delay each word list is only loaded once, it is not deleted
 when 'spelllang' is made empty or 'spell' is reset.  When 'encoding' is set
 all the word lists are reloaded, thus you may notice a delay then too.

@@ -260,19 +286,20 @@ find these functions useful:

    spellbadword()	find badly spelled word at the cursor
    spellsuggest()	get list of spelling suggestions
+    soundfold()		get the sound-a-like version of a word

 ==============================================================================
-2. Generating a spell file				*spell-mkspell*
+3. Generating a spell file				*spell-mkspell*

 Vim uses a binary file format for spelling.  This greatly speeds up loading
 the word list and keeps it small.
-
+						    *.aff* *.dic* *Myspell*
 You can create a Vim spell file from the .aff and .dic files that Myspell
 uses.  Myspell is used by OpenOffice.org and Mozilla.  You should be able to
 find them here:
 	http://lingucomponent.openoffice.org/spell_dic.html
 You can also use a plain word list.  The results are the same, the choice
-depends on what you find.
+depends on what word lists you can find.

 Make sure your current locale is set properly, otherwise Vim doesn't know what
 characters are upper/lower case letters.  If the locale isn't available (e.g.,
@@ -284,7 +311,7 @@ then Vim will try to guess.
 							*:mksp* *:mkspell*
 :mksp[ell][!] [-ascii] {outname} {inname} ...
 			Generate a Vim spell file word lists.  Example: >
-		:mkspell nl nl_NL.words
+		:mkspell /tmp/nl nl_NL.words
 <								*E751*
 			When {outname} ends in ".spl" it is used as the output
 			file name.  Otherwise it should be a language name,
@@ -292,7 +319,7 @@ then Vim will try to guess.
 			written will be "{outname}.{encoding}.spl", where
 			{encoding} is the value of the 'encoding' option.

-			When the output file already exists [!] must be added
+			When the output file already exists [!] must be used
 			to overwrite it.

 			When the [-ascii] argument is present, words with
@@ -318,13 +345,18 @@ then Vim will try to guess.
 			the optimal word tree (Polish requires a few hundred
 			Mbyte).  The final result will be much smaller.

-			When the spell file was written all currently used
-			spell files will be reloaded.
+			After the spell file was written and it was being used
+			in a buffer it will be reloaded automatically.

-:mksp[ell] [-ascii] {add-name}
-			Like ":mkspell" above, using {add-name} as the input
-			file and producing an output file that has ".spl"
-			appended.
+:mksp[ell] [-ascii] {name}.{enc}.add
+			Like ":mkspell" above, using {name}.{enc}.add as the
+			input file and producing an output file in the same
+			directory that has ".spl" appended.
+
+:mksp[ell] [-ascii] {name}
+			Like ":mkspell" above, using {name} as the input file
+			and producing an output file in the same directory
+			that has ".{enc}.spl" appended.

 Since you might want to change a Myspell word list for use with Vim the
 following procedure is recommended:
@@ -334,9 +366,11 @@ following procedure is recommended:
 3. Change the xx_YY.aff and xx_YY.dic files to remove bad words, add missing
   words, define word characters with FOL/LOW/UPP, etc.  The distributed
   "src/spell/*.diff" files can be used.
-4. Set 'encoding' to the desired encoding and use |:mkspell| to generate the
-   Vim spell file.
-5. Try out the spell file with ":set spell spelllang=xx_YY".
+4. Start Vim with the right locale and use |:mkspell| to generate the Vim
+   spell file.
+5. Try out the spell file with ":set spell spelllang=xx" if you wrote it in
+   a spell directory in 'runtimepath, or ":set spelllang=xx.enc.spl" if you
+   wrote it somewhere else.

 When the Myspell files are updated you can merge the differences:
 1. Obtain the new Myspell files as xx_YY.new.aff and xx_UU.new.dic.
@@ -355,69 +389,80 @@ used spelling files, use this command:
 							*:spelldump* *:spelld*
 :spelld[ump]		Open a new window and fill it with all currently valid
 			words.
-			Note: For some languages the result may be huge and
-			Vim may run out of memory.
+			Note: For some languages the result may be enormous,
+			causing Vim to run out of memory.

 The format of the word list is used |spell-wordlist-format|.  You should be
 able to read it with ":mkspell" to generate one .spl file that includes all
 the words.

-Only words for the current region are included.  No "/regions" line is
-generated.
+When all entries to 'spelllang' use the same regions or no regions at all then
+the region information is included in the dumped words.  Otherwise only words
+for the current region are included and no "/regions" line is generated.

-Comment lines are used to indicate which .spl file the words came from.
+Comment lines with the name of the .spl file are used as a header above the
+words that were generated from that .spl file.

 ==============================================================================
-3. Spell file format					*spell-file-format*
+4. Spell file format					*spell-file-format*

 This is the format of the files that are used by the person who creates and
 maintains a word list.

 Note that we avoid the word "dictionary" here.  That is because the goal of
 spell checking differs from writing a dictionary (as in the book).  For
-spelling we need a list of words that are OK, thus need not to be highlighted.
-Names will not appear in a dictionary, but do appear in a word list.  And
-some old words are rarely used and are common misspellings.  These do appear
-in a dictionary but not in a word list.
+spelling we need a list of words that are OK, thus should not to be
+highlighted.  Person and company names will not appear in a dictionary, but do
+appear in a word list.  And some old words are rarely used while they are
+common misspellings.  These do appear in a dictionary but not in a word list.

-There are two formats: one with affix compression and one without.  The files
-with affix compression are used by Myspell (Mozilla and OpenOffice.org).  This
-requires two files, one with .aff and one with .dic extension.  The second
-format is a list of words.
+There are two formats: A straigth list of words and a list using affix
+compression.  The files with affix compression are used by Myspell (Mozilla
+and OpenOffice.org).  This requires two files, one with .aff and one with .dic
+extension.


-FORMAT OF WORD LIST				*spell-wordlist-format*
+FORMAT OF STRAIGHT WORD LIST				*spell-wordlist-format*

 The words must appear one per line.  That is all that is required.
+
 Additionally the following items are recognized:
+
 - Empty and blank lines are ignored.
+
 - Lines starting with a # are ignored (comment lines).
+
 - A line starting with "/encoding=", before any word, specifies the encoding
  of the file.  After the second '=' comes an encoding name.  This tells Vim
-  to setup conversion from the specified encoding to 'encoding'.
+  to setup conversion from the specified encoding to 'encoding'.  Thus you can
+  use one word list for several target encodings.
+
 - A line starting with "/regions=" specifies the region names that are
  supported.  Each region name must be two ASCII letters.  The first one is
  region 1.  Thus "/regions=usca" has region 1 "us" and region 2 "ca".
-  In an addition word list the list should be equal to the main word list!
- A line starting with "/?" specifies a word that should be marked as rare.
- A line starting with "/!" specifies a word that should be marked as bad.
- A line starting with "/=" specifies a word where case must match exactly.
-  A "?" or "!" may be following: "/=?" and "/=!".
- Digits after "/" indicate the regions in which the word is valid.  If no
-  regions are specified the word is valid in all regions.
+  In an addition word list the region names should be equal to the main word
+  list!
+
 - Other lines starting with '/' are reserved for future use.  The ones that
  are not recognized are ignored (but you do get a warning message).

+- A "/" may follow the word with the following items:
+    =   	Case must match exactly.
+    ?		Rare word.
+    !		Bad (wrong) word.
+    digit	A region in which the word is valid.  If no regions are
+    		specified the word is valid in all regions.
+
 Example:

 	# This is an example word list		comment
 	/encoding=latin1			encoding of the file
 	/regions=uscagb				regions "us", "ca" and "gb"
 	example					word for all regions
-	/1blah					word for region 1 "us"
-	/!vim					bad word
-	/?3Campbell				rare word in region 3 "gb"
-	/='s mornings				keep-case word
+	blah/12					word for regions "us" and "ca"
+	vim/!					bad word
+	Campbell/?3				rare word in region 3 "gb"
+	's mornings/=				keep-case word


 FORMAT WITH AFFIX COMPRESSION
@@ -475,7 +520,7 @@ is required at this position.  The same word with a lower-case letter at this
 position will not match. When some of the other letters are upper-case it will
 not match either.

-The same word with all upper-case characters will always be OK.
+The word with all upper-case characters will always be OK.

 	word list	matches			does not match ~
 	als		als Als ALS		ALs AlS aLs aLS
@@ -492,7 +537,9 @@ when it appears with a non-word character before and after it.  For Myspell a
 word starting with a non-word character probably won't work.

 After the word there is an optional slash and flags.  Most of these flags are
-letters that indicate the affixes that can be used with this word.
+letters that indicate the affixes that can be used with this word.  These are
+specified with SFX and PFX lines in the .aff file.  See the Myspell
+documentation.

 							*spell-affix-vim*
 A flag that Vim adds and is not in Myspell is the flag defined with KEP in the
@@ -510,7 +557,8 @@ the affix file.  The affix file must always be in the same encoding as the
 word list.  This is compatible with Myspell.  For Vim the encoding may also be
 something else, any encoding that "iconv" supports.  The "SET" line must
 specify the name of the encoding.  When using a multi-byte encoding it's
-possible to use more different affixes.
+possible to use more different affixes (but Myspell doesn't support that, thus
+you may not want to use it anyway).


 CHARACTER TABLES
@@ -557,14 +605,43 @@ contain the table with characters, so that it can be combine with spell files
 for any encoding.  The .add.spl files also do not contain the table.


+MID-WORD CHARACTERS
+							*spell-midword*
+Some characters are only to be considered word characters if they are used in
+between two ordinary word characters.  An example is the single quote: It is
+often used to put text in quotes, thus it can't be recognized as a word
+character, but when it appears in between word characters it must be part of
+the word.  This is needed to detect a spelling error such as they'are.  That
+should be they're, but since "they" and "are" are words themselves that would
+go unnoticed.
+
+These characters are defined with MIDWORD in the .aff file:
+
+	MIDWORD	'- ~
+
+
 AFFIXES
 					    *spell-affix-PFX* *spell-affix-SFX*
 The usual PFX (prefix) and SFX (suffix) lines are supported (see the Myspell
-documentation).  Note that Myspell ignores any extra text after the relevant
-info.  Vim requires this text to start with a "#" so that mistakes don't go
-unnoticed.  Example:
+documentation or the Aspell manual:
+http://aspell.net/man-html/Affix-Compression.html).

-	SFX F 0 in [^i]n      # Spion > Spionin  ~
+Note that Myspell ignores any extra text after the relevant info.  Vim
+requires this text to start with a "#" so that mistakes don't go unnoticed.
+Example:
+
+	SFX F 0 in   [^i]n      # Spion > Spionin  ~
+	SFX F 0 nen  in         # Bauerin > Bauerinnen ~
+
+An extra item for Vim is the "rare" flag.  It must come after the other
+fields, before a comment.  When used then all words that use the affix will be
+marked as rare words.  Example:
+
+	PFX F 0 nene  .   rare ~
+	SFX F 0 oin   n   rare   # hardly ever used ~
+
+However, if the word also appears as a good word in another way it won't be
+marked as rare.

 						    *spell-affix-PFXPOSTPONE*
 When an affix file has very many prefixes that apply to many words it's not
@@ -610,8 +687,12 @@ bad words.  Example:
 	BAD ! ~

 This can be used to exclude words that would otherwise be good.  For example
-"the the".  Once a word has been marked as bad it won't be undone by
-encountering the same word as good.
+"the the" in the .dic file:
+
+	the the/! ~
+
+Once a word has been marked as bad it won't be undone by encountering the same
+word as good.


 REPLACEMENTS						*spell-affix-REP*
@@ -627,11 +708,14 @@ used to make spelling suggestions.  The items define the "from" text and the
 	REP ch k ~

 The first line specifies the number of REP lines following.  Vim ignores it.
+Don't include simple one-character replacements or swaps.  Vim will try these
+anyway.  You can include whole words if you want to, but you might want to use
+the "file:" item in 'spellsuggest' instead.


 SIMILAR CHARACTERS					*spell-affix-MAP*

-In the affix file MAP items can be used to define letters that very much
+In the affix file MAP items can be used to define letters that are very much
 alike.  This is mostly used for a letter with different accents.  This is used
 to prefer suggestions with these letters substituted.  Example:

@@ -641,22 +725,24 @@ to prefer suggestions with these letters substituted.  Example:

 The first line specifies the number of MAP lines following.  Vim ignores it.

-A letter must only appear in one of the MAP items.  It's a bit more efficient
-if the first letter is ASCII or at least one without accents.
+Each letter must appear in only one of the MAP items.  It's a bit more
+efficient if the first letter is ASCII or at least one without accents.


-SOUNDS-A-LIKE						*spell-affix-SAL*
+SOUND-A-LIKE						*spell-affix-SAL*

 In the affix file SAL items can be used to define the sounds-a-like mechanism
 to be used.  The main items define the "from" text and the "to" replacement.
-Example:
+Simplistic example:

 	SAL CIA                  X ~
 	SAL CH                   X ~
 	SAL C                    K ~
 	SAL K                    K ~

-TODO: explain how it works.
+There are a few rules and this can become quite complicated.  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:

@@ -666,4 +752,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
+both SAL items and simple soundfolding.
+
+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 would be 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:
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0aa.  Last change: 2005 May 31
+*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -890,7 +890,8 @@ set, it will be set to 'nocompatible'.  This has the side effect of setting or
 resetting other options (see 'compatible').  But only the options that have
 not been set or reset will be changed.  This has the same effect like the
 value of 'compatible' had this value when starting Vim.  Note that this
-doesn't happen for the system-wide vimrc file.
+doesn't happen for the system-wide vimrc file.  It does also happen for gvimrc
+files.

 But there is a side effect of setting or resetting 'compatible' at the moment
 a .vimrc file is found: Mappings are interpreted the moment they are
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1226,6 +1226,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 -y	starting.txt	/*-y*
 .	repeat.txt	/*.*
 .Xdefaults	gui_x11.txt	/*.Xdefaults*
+.aff	spell.txt	/*.aff*
+.dic	spell.txt	/*.dic*
 .exrc	starting.txt	/*.exrc*
 .gvimrc	gui.txt	/*.gvimrc*
 .vimrc	starting.txt	/*.vimrc*
@@ -2230,6 +2232,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :print	various.txt	/*:print*
 :pro	change.txt	/*:pro*
 :prof	repeat.txt	/*:prof*
+:profd	repeat.txt	/*:profd*
+:profdel	repeat.txt	/*:profdel*
 :profile	repeat.txt	/*:profile*
 :promptfind	change.txt	/*:promptfind*
 :promptr	change.txt	/*:promptr*
@@ -2411,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*
@@ -3706,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*
@@ -3817,6 +3825,7 @@ MiNT	os_mint.txt	/*MiNT*
 Moolenaar	intro.txt	/*Moolenaar*
 MorphOS	os_amiga.txt	/*MorphOS*
 Motif	gui_x11.txt	/*Motif*
+Myspell	spell.txt	/*Myspell*
 MzScheme	if_mzsch.txt	/*MzScheme*
 N	pattern.txt	/*N*
 N%	motion.txt	/*N%*
@@ -4994,6 +5003,7 @@ g_CTRL-]	tagsrch.txt	/*g_CTRL-]*
 g`	motion.txt	/*g`*
 g`a	motion.txt	/*g`a*
 ga	various.txt	/*ga*
+garbagecollect()	eval.txt	/*garbagecollect()*
 gd	pattern.txt	/*gd*
 ge	motion.txt	/*ge*
 get()	eval.txt	/*get()*
@@ -5135,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*
@@ -6247,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*
@@ -6269,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*
@@ -6276,8 +6290,10 @@ spell-affix-vim	spell.txt	/*spell-affix-vim*
 spell-dic-format	spell.txt	/*spell-dic-format*
 spell-file-format	spell.txt	/*spell-file-format*
 spell-load	spell.txt	/*spell-load*
+spell-midword	spell.txt	/*spell-midword*
 spell-mkspell	spell.txt	/*spell-mkspell*
 spell-quickstart	spell.txt	/*spell-quickstart*
+spell-remarks	spell.txt	/*spell-remarks*
 spell-syntax	spell.txt	/*spell-syntax*
 spell-wordlist-format	spell.txt	/*spell-wordlist-format*
 spell.txt	spell.txt	/*spell.txt*
@@ -7100,6 +7116,7 @@ zC	fold.txt	/*zC*
 zD	fold.txt	/*zD*
 zE	fold.txt	/*zE*
 zF	fold.txt	/*zF*
+zG	spell.txt	/*zG*
 zH	scroll.txt	/*zH*
 zL	scroll.txt	/*zL*
 zM	fold.txt	/*zM*
@@ -7117,6 +7134,7 @@ zOS-open-source	os_390.txt	/*zOS-open-source*
 zOS-weaknesses	os_390.txt	/*zOS-weaknesses*
 zOS-xterm	os_390.txt	/*zOS-xterm*
 zR	fold.txt	/*zR*
+zW	spell.txt	/*zW*
 zX	fold.txt	/*zX*
 z^	scroll.txt	/*z^*
 za	fold.txt	/*za*
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 25
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 01


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -96,57 +96,44 @@ Awaiting response:

 PLANNED FOR VERSION 7.0:

-   Add SPELLCHECKER, with support for many languages.
-    - Spell checking code todo's:
-	- Special handling of ' and -: define in the .aff file.
-	    Aspell does this with "special".
-	- Support user function to make suggestions:
-	    :set spellsuggest=MySuggest,fast
-	  Also support a list with common mistakes?
-	- For "z?" a "replace all" mechanism would be welcome.
-        - Add hl groups to 'spelllang'?
-	    :set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath
-	  More complicated: Regions with different languages?  E.g.  comments
-	  in English, strings in German (po file).
-	- Code for making suggestions:
-	  - Hebrew: also use prefixes for suggestions.  See message from
-	    Kaminsky (June 20) for ideas.
-	  - The sound-folding doesn't work for multi-byte characters.  It's
-	    very slow too.
-	  - Simple and fast sound-a-like: mapping list for first char and rest
-		    vowel as first char: *
-		    remove other vowels
-	- Cleanup spell help.
-    - Use "engspchk" from Charles Campbell for ideas (commands, rare words).
-    - Make "en-rare" spell file?  Ask Charles Campbell.
-    - References: MySpell library (in OpenOffice.org).
-	http://spellchecker.mozdev.org/source.html
-	http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
-      author: Kevin Hendricks <kevin.hendricks@sympatico.ca>
-    - Update option window for 'verbosefile', 'spell', 'spellfile',
-      'spellsuggest' and 'spelllang'.
+- Spell checking todo's:
+    - When "zW" and "zG" are repeated with the same word it stops working
+    - More ideas:
+	- Support project word list?
+	- Check for Cap after punctuation "..." or char in ".!?"
    - Distribution: Need wordlists for many languages; "language pack"
      Put them on the ftp site, ready to download.  Include README for
      copyrights.
    - Work together with OpenOffice.org to update the wordlists.  (Adri
      Verhoef, Aad Nales)  Setup vim-spell maillist?
-    - Insert mode completion mechanism that uses the spell word lists.
    - Charles Campbell asks for method to add "contained" groups to
      existing syntax items (to add @Spell).
      Add ":syntax contains {pattern} add=@Spell" command?  A bit like ":syn
      cluster" but change the contains list directly for matching syntax
      items.
    - Install spell files with src/main.aap.
-    - Alternate Dutch word list at www.nederlandsewoorden.nl (use script to
-      obtain).  But new Myspell wordlist will come (Hagen)
+    Later:
+    - References: MySpell library (in OpenOffice.org).
+	http://spellchecker.mozdev.org/source.html
+	http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
+      author: Kevin Hendricks <kevin.hendricks@sympatico.ca>
+    - Make "en-rare" spell file?  Ask Charles Campbell.
    - The English dictionaries for different regions are not consistent in
      their use of words with a dash.
-    Later:
+    - Alternate Dutch word list at www.nederlandsewoorden.nl (use script to
+      obtain).  But new Myspell wordlist will come (Hagen)
+    - Insert mode completion mechanism that uses the spell word lists.
+    - Add hl groups to 'spelllang'?
+	:set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath
+      More complicated: Regions with different languages?  E.g.  comments
+      in English, strings in German (po file).
    - Implement compound words when it works for Myspell.  Current idea has
      the problem that "foo/X" always allows "foofoo", there is no way to
      specify a word can only be at the start or end, or that only certain
      words combine.

+-   Support using "**" in filename for ":next", ":vimgrep", etc., so that a
+    directory tree can be searched.
 -   REFACTORING: The main() function is very long.  Move parts to separate
    functions, especially loops.  Ideas from Walter Briscoe (2003 Apr 3, 2004
    Feb 9).
@@ -154,8 +141,6 @@ PLANNED FOR VERSION 7.0:
 -   Improve the interface between the generic GUI code and the system-specific
    code.  Generic code handles text window with scrollbars, system-specific
    code menu, toolbar, etc.
-   Support using "**" in filename for ":next", ":vimgrep", etc., so that a
-    directory tree can be searched.
 -   Store messages to allow SCROLLING BACK for all commands.  And other "less"
    like commands.
 -   "INTELLISENSE".  First cleanup the Insert-mode completion.
@@ -2944,6 +2929,8 @@ Options:
 8   Make ":mksession" store buffer-specific options for the specific buffer.
 8   With ":mksession" always store the 'sessionoptions' option, even when
    "options" isn't in it. (St-Amant)
+7   ":with option=value | command": temporarily set an option value and
+    restore it after the command has executed.
 7   Setting an option always sets "w_set_curswant", while this is only
    required for a few options.  Only do it for those options to avoid the
    side effect.
--- a/runtime/doc/version7.txt
+++ b/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 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -111,6 +111,9 @@ translated to <Home>, both for the keys and for mappings.  Also for <xEnd>,

 ":put" now leaves the cursor on the last inserted line.

+When a .gvimrc file exists then 'compatible' is off, just like when a ".vimrc"
+file exists.
+
 ==============================================================================
 NEW FEATURES						*new-7*

@@ -145,10 +148,12 @@ with scripts, but they were slow and/or required an external program.
 The 'spell' option is used to switch spell checking on or off.
 The 'spelllang' option is used to specify the languages that are accepted.
 The 'spellfile' option specifies where new words are added.
+The 'spellsuggest' option specifies the methods used for making suggestions

 The |[s| and |]s| commands can be used to move to the next or previous error.
 The |zg| and |zw| commands can be used to add good and wrong words.
 The |z?| command can be used to correct the word.
+The |:mkspell| command is used to generate a Vim spell file from word lists.

 The "undercurl" highlighting attribute was added to nicely point out spelling
 mistakes in the GUI (based on patch from Marcin Dalecki).
@@ -305,6 +310,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 +383,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 +444,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 +1157,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:
--- a/runtime/doc/vimdiff.man
+++ b/runtime/doc/vimdiff.man
@@ -30,7 +30,7 @@ DESCRIPTION

 OPTIONS
       Vertical  splits  are  used to align the lines, as if the "-O" argument
-       was used.  To use horizontal splits intead, use the "-o" argument.
+       was used.  To use horizontal splits instead, use the "-o" argument.

       For all other arguments see vim(1).

--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 17
+" Last Change:	2005 Jun 30

 " 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

@@ -1561,7 +1585,27 @@ au BufNewFile,BufRead *.slt			setf tsalt
 au BufNewFile,BufRead *.ti			setf terminfo

 " TeX
-au BufNewFile,BufRead *.tex,*.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
+au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
+au BufNewFile,BufRead *.tex			call s:FTtex()
+
+fun! s:FTtex()
+  let n = 1
+  while n < 10 && n < line("$")
+    let line = getline(n)
+    if line =~ '^\s*\\\%(documentclass\>\|usepackage\>\|begin{\)'
+      setf tex
+      return
+    elseif line =~ '^\s*\\\%(start\l\+\|setup\l\+\|usemodule\)\>'
+      setf context
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf tex
+endfun
+
+" Context
+au BufNewFile,BufRead tex/context/*/*.tex	setf context

 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
@@ -1593,12 +1637,15 @@ 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

 " VHDL
 au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst  setf vhdl
-au BufNewFile,BufRead *.vhdl_[0-9]*  		call s:StarSetf('vhdl')
+au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')

 " Vim script
 au BufNewFile,BufRead *.vim,.exrc,_exrc		setf vim
@@ -1673,6 +1720,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 +1759,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 && n < line("$")
+    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 +1860,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 +1894,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')

--- a/runtime/ftplugin/alsaconf.vim
+++ b/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
--- a/runtime/ftplugin/arch.vim
+++ b/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
--- a/runtime/ftplugin/automake.vim
+++ b/runtime/ftplugin/automake.vim
@@ -1,11 +1,10 @@
 " Vim filetype plugin file
-" Langugage:	    Automake
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/automake/
-" Latest Revision:  2004-05-22
-" arch-tag:	    3a78b0cd-27b2-410a-8e7b-51a1717c2a5b
+" Language:         Automake
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-22
+
+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:
--- a/runtime/ftplugin/bdf.vim
+++ b/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
--- a/runtime/ftplugin/calendar.vim
+++ b/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&
--- a/runtime/ftplugin/changelog.vim
+++ b/runtime/ftplugin/changelog.vim
@@ -1,24 +1,22 @@
 " Vim filetype plugin file
-" Language:	    generic Changelog file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/changelog/
-" Latest Revision:  2004-04-25
-" arch-tag:	    b00e2974-c559-4477-b7b2-3ef3f4061bdb
+" Language:         generic Changelog file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
 " Variables:
 "   g:changelog_timeformat -
-"	description: the timeformat used in ChangeLog entries.
-"	default: "%Y-%m-%d".
+"       description: the timeformat used in ChangeLog entries.
+"       default: "%Y-%m-%d".
 "   g:changelog_username -
-"	description: the username to use in ChangeLog entries
-"	default: try to deduce it from environment variables and system	files.
+"       description: the username to use in ChangeLog entries
+"       default: try to deduce it from environment variables and system files.
 " Local Mappings:
 "   <Leader>o -
-"	adds a new changelog entry for the current user for the current date.
+"       adds a new changelog entry for the current user for the current date.
 " Global Mappings:
 "   <Leader>o -
-"	switches to the ChangeLog buffer opened for the current directory, or
-"	opens it in a new buffer if it exists in the current directory.  Then
-"	it does the same as the local <Leader>o described above.
+"       switches to the ChangeLog buffer opened for the current directory, or
+"       opens it in a new buffer if it exists in the current directory.  Then
+"       it does the same as the local <Leader>o described above.
 " Notes:
 "   run 'runtime ftplugin/changelog.vim' to enable the global mapping for
 "   changelog files.
@@ -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
-  set cpo-=C
+  let s:cpo_save = &cpo
+  set cpo&vim

  " The format of the date-time field (should have been called dateformat)
  if !exists("g:changelog_timeformat")
@@ -55,56 +50,56 @@ if &filetype == "changelog"
      " Get the users login name
      let login = system('whoami')
      if v:shell_error
-	let login = 'unknown'
+        let login = 'unknown'
      else
-	let newline = stridx(login, "\n")
-	if newline != -1
-	  let login = strpart(login, 0, newline)
-	endif
+        let newline = stridx(login, "\n")
+        if newline != -1
+          let login = strpart(login, 0, newline)
+        endif
      endif

      " Try to full name from gecos field in /etc/passwd
      if filereadable('/etc/passwd')
-	let name = substitute(
-	      \system('cat /etc/passwd | grep ^`whoami`'),
-	      \'^\%([^:]*:\)\{4}\([^:]*\):.*$', '\1', '')
+        let name = substitute(
+              \system('cat /etc/passwd | grep ^`whoami`'),
+              \'^\%([^:]*:\)\{4}\([^:]*\):.*$', '\1', '')
      endif

      " If there is no such file, or there was some other problem try
      " others
      if !filereadable('/etc/passwd') || v:shell_error
-	" Maybe the environment has something of interest
-	if exists("$NAME")
-	  let name = $NAME
-	else
-	  " No? well, use the login name and capitalize first
-	  " character
-	  let name = toupper(login[0]) . strpart(login, 1)
-	endif
+        " Maybe the environment has something of interest
+        if exists("$NAME")
+          let name = $NAME
+        else
+          " No? well, use the login name and capitalize first
+          " character
+          let name = toupper(login[0]) . strpart(login, 1)
+        endif
      endif

      " Only keep stuff before the first comma
      let comma = stridx(name, ',')
      if comma != -1
-	let name = strpart(name, 0, comma)
+        let name = strpart(name, 0, comma)
      endif

      " And substitute & in the real name with the login of our user
      let amp = stridx(name, '&')
      if amp != -1
-	let name = strpart(name, 0, amp) . toupper(login[0]) .
-	      \strpart(login, 1) . strpart(name, amp + 1)
+        let name = strpart(name, 0, amp) . toupper(login[0]) .
+              \strpart(login, 1) . strpart(name, amp + 1)
      endif

      " Get our hostname
      let hostname = system("hostname")
      if v:shell_error
-	let hostname = 'unknownhost'
+        let hostname = 'unknownhost'
      else
-	let newline = stridx(hostname, "\n")
-	if newline != -1
-	  let hostname = strpart(hostname, 0, newline)
-	endif
+        let newline = stridx(hostname, "\n")
+        if newline != -1
+          let hostname = strpart(hostname, 0, newline)
+        endif
      endif

      " And finally set the username
@@ -134,15 +129,15 @@ if &filetype == "changelog"
    while i != -1
      let char = str[i + 1]
      if char == '%'
-	let middle = '%'
+        let middle = '%'
      elseif char == 'd'
-	let middle = a:date
+        let middle = a:date
      elseif char == 'u'
-	let middle = a:user
+        let middle = a:user
      elseif char == 'c'
-	let middle = '{cursor}'
+        let middle = '{cursor}'
      else
-	let middle = char
+        let middle = char
      endif
      let str = strpart(str, 0, i) . middle . strpart(str, i + 2)
      let i = stridx(str, '%')
@@ -169,17 +164,17 @@ if &filetype == "changelog"
    " Look for an entry for today by our user
    let date = strftime(g:changelog_timeformat)
    let search = s:substitute_items(g:changelog_date_entry_search, date,
-	  \g:changelog_username)
+          \g:changelog_username)
    if search(search) > 0
      " Ok, now we look for the end of the date-entry, and add an entry
      let pos = nextnonblank(line('.') + 1)
      let line = getline(pos)
      while line =~ '^\s\+\S\+'
-	let pos = pos + 1
-	let line = getline(pos)
+        let pos = pos + 1
+        let line = getline(pos)
      endwhile
      let insert = s:substitute_items(g:changelog_new_entry_format,
-	    \'', '')
+            \'', '')
      execute "normal! ".(pos - 1)."Go".insert
      execute pos
    else
@@ -188,18 +183,18 @@ if &filetype == "changelog"

      " No entry today, so create a date-user header and insert an entry
      let todays_entry = s:substitute_items(g:changelog_new_date_format,
-	    \date, g:changelog_username)
+            \date, g:changelog_username)
      " Make sure we have a cursor positioning
      if stridx(todays_entry, '{cursor}') == -1
-	let todays_entry = todays_entry.'{cursor}'
+        let todays_entry = todays_entry.'{cursor}'
      endif

      " Now do the work
      execute "normal! i".todays_entry
      if remove_empty
-	while getline('$') == ''
-	  $delete
-	endwhile
+        while getline('$') == ''
+          $delete
+        endwhile
      endif

      1
@@ -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>
@@ -234,23 +230,21 @@ else
  function! s:open_changelog()
    if filereadable('ChangeLog')
      if bufloaded('ChangeLog')
-	let buf = bufnr('ChangeLog')
-	execute "normal! \<C-W>t"
-	while winbufnr(winnr()) != buf
-	  execute "normal! \<C-W>w"
-	endwhile
+        let buf = bufnr('ChangeLog')
+        execute "normal! \<C-W>t"
+        while winbufnr(winnr()) != buf
+          execute "normal! \<C-W>w"
+        endwhile
      else
-	split ChangeLog
+        split ChangeLog
      endif

      if exists("g:mapleader")
-	execute "normal " . g:mapleader . "o"
+        execute "normal " . g:mapleader . "o"
      else
-	execute "normal \\o"
+        execute "normal \\o"
      endif
      startinsert!
    endif
  endfunction
 endif
-
-" vim: set sts=2 sw=2:
--- a/runtime/ftplugin/conf.vim
+++ b/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
--- a/runtime/ftplugin/context.vim
+++ b/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
--- a/runtime/ftplugin/crm.vim
+++ b/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
--- a/runtime/ftplugin/css.vim
+++ b/runtime/ftplugin/css.vim
@@ -1,20 +1,15 @@
 " Vim filetype plugin file
-" Language:	    CSS
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/css/
-" Latest Revision:  2004-04-25
-" arch-tag:	    5fa7c74f-bf1a-47c4-b06f-6efe8f48db3b
+" Language:         CSS
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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(\)\='
--- a/runtime/ftplugin/cvsrc.vim
+++ b/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=
--- a/runtime/ftplugin/dircolors.vim
+++ b/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
--- a/runtime/ftplugin/elinks.vim
+++ b/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
--- a/runtime/ftplugin/eterm.vim
+++ b/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
--- a/runtime/ftplugin/fetchmail.vim
+++ b/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
--- a/runtime/ftplugin/gpg.vim
+++ b/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
--- a/runtime/ftplugin/grub.vim
+++ b/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
--- a/runtime/ftplugin/haskell.vim
+++ b/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
--- a/runtime/ftplugin/help.vim
+++ b/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
--- a/runtime/ftplugin/indent.vim
+++ b/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:*/
--- a/runtime/ftplugin/ld.vim
+++ b/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
--- a/runtime/ftplugin/lftp.vim
+++ b/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
--- a/runtime/ftplugin/libao.vim
+++ b/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
--- a/runtime/ftplugin/limits.vim
+++ b/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
--- a/runtime/ftplugin/loginaccess.vim
+++ b/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
--- a/runtime/ftplugin/logindefs.vim
+++ b/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
--- a/runtime/ftplugin/m4.vim
+++ b/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
--- a/runtime/ftplugin/mailcap.vim
+++ b/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
--- a/runtime/ftplugin/modconf.vim
+++ b/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
--- a/runtime/ftplugin/mplayerconf.vim
+++ b/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
--- a/runtime/ftplugin/muttrc.vim
+++ b/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\>'
--- a/runtime/ftplugin/netrc.vim
+++ b/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=
--- a/runtime/ftplugin/pamconf.vim
+++ b/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
--- a/runtime/ftplugin/pinfo.vim
+++ b/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
--- a/runtime/ftplugin/procmail.vim
+++ b/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\>'
--- a/runtime/ftplugin/prolog.vim
+++ b/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
--- a/runtime/ftplugin/quake.vim
+++ b/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
--- a/runtime/ftplugin/racc.vim
+++ b/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
--- a/runtime/ftplugin/readline.vim
+++ b/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
--- a/runtime/ftplugin/rnc.vim
+++ b/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
--- a/runtime/ftplugin/rst.vim
+++ b/runtime/ftplugin/rst.vim
@@ -1,23 +1,13 @@
 " Vim filetype plugin file
-" Language:	    reStructuredText Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/ftplugin/pcp/rst/
-" Latest Revision:  2004-04-25
-" arch-tag:	    618bf504-81ba-4518-bad2-43ba2b844a26
+" Language:         reStructuredText documentation format
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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 commentstring=..\ %s
-setlocal expandtab
-setlocal sts=2 sw=2
-
-" vim: set sts=2 sw=2:
+setlocal comments=fb:.. commentstring=..\ %s expandtab
--- a/runtime/ftplugin/screen.vim
+++ b/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
--- a/runtime/ftplugin/sieve.vim
+++ b/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
--- a/runtime/ftplugin/sshconfig.vim
+++ b/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
--- a/runtime/ftplugin/sudoers.vim
+++ b/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
--- a/runtime/ftplugin/sysctl.vim
+++ b/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
--- a/runtime/ftplugin/terminfo.vim
+++ b/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
--- a/runtime/ftplugin/updatedb.vim
+++ b/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
--- a/runtime/ftplugin/xdefaults.vim
+++ b/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&
--- a/runtime/ftplugin/xf86conf.vim
+++ b/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
--- a/runtime/ftplugin/xinetd.vim
+++ b/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
--- a/runtime/ftplugin/xmodmap.vim
+++ b/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
--- a/runtime/ftplugin/yaml.vim
+++ b/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
--- a/runtime/ftplugin/zsh.vim
+++ b/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
--- a/runtime/indent/automake.vim
+++ b/runtime/indent/automake.vim
@@ -1,11 +1,11 @@
 " Vim indent file
-" Language:	    automake
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/automake/
-" Latest Revision:  2004-04-25
-" arch-tag:	    9a2af48c-48d4-4bae-82c3-c801bc9d1976
+" Language:         automake
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_indent")
+  finish
+endif

 " same as makefile indenting for now.
-source <sfile>:p:h/make.vim
-
-" vim: set sts=2 sw=2:
+runtime! indent/make.vim
--- a/runtime/indent/config.vim
+++ b/runtime/indent/config.vim
@@ -1,18 +1,17 @@
 " Vim indent file
-" Language:	    Autoconf configure.{ac,in} file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/config/
-" Latest Revision:  2004-04-25
-" arch-tag:	    7779c341-796f-408e-80e4-a55c26b519a4
-" TODO:		    how about nested [()]'s in one line
-"		    what's wrong with '\\\@!'?
+" Language:         Autoconf configure.{ac,in} file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" URL:              http://www.pcppopper.org/vim/indent/pcp/config/
+" Latest Revision:  2005-06-29
+" TODO:             how about nested [()]'s in one line
+"                   what's wrong with '\\\@!'?

 " Only load this indent file when no other was loaded.
 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
--- a/runtime/indent/css.vim
+++ b/runtime/indent/css.vim
@@ -1,79 +1,54 @@
 " Vim indent file
-" Language:	    CSS
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/css/
-" Latest Revision:  2004-04-25
-" arch-tag:	    ccfd77a0-1c9a-43f7-a407-bbe704541442
+" Language:         CSS
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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)
-  " find a non-blank line above the current line
+function s:LookupLine(lnum)
  let lnum = prevnonblank(a:lnum - 1)
+  while lnum > 0
+    let line = getline(lnum)

-  if lnum == 0
-    return 0
-  endif
+    if line =~ '\*/'
+      while lnum > 0 && line !~ '/\*'
+        let lnum -= 1
+        let line = getline(lnum)
+      endwhile
+    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 !~ '/\*'
-      let lnum = lnum - 1
-      let line = getline(lnum)
-    endwhile
-  endif
-
-  " if the line we found only contained the comment and whitespace
-  " we need to find another line to use...
-  if line =~ '^\s*/\*'
-    return s:LookupLine(lnum)
-  else
-    return lnum
-  endif
+    if line !~ '^\s*/\*'
+      return lnum
+    end
+  endwhile
+  return lnum
 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
-  " skip if it also contains a closing brace...
-  if line =~ '{\(.*}\)\@!'
+  if substitute(getline(lnum), '/\*.*', '', 'e') =~ '{\(.*}\)\@!'
    let ind = ind + &sw
  endif

-  let line = getline(v:lnum)
-
-  " check for closing brace first on current line
-  if line =~ '^\s*}'
-    let ind	= ind - &sw
+  if getline(v:lnum) =~ '^\s*}'
+    let ind = ind - &sw
  endif

  return ind
 endfunction
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/docbk.vim
+++ b/runtime/indent/docbk.vim
@@ -1,12 +1,10 @@
 " Vim indent file
-" Language:	    DocBook Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/docbk/
-" Latest Revision:  2004-05-22
-" arch-tag:	    3d073af7-1d69-42a2-99ad-9a49a21eb28f
+" Language:         DocBook Documentation Format
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

 if exists("b:did_indent")
-    finish
+  finish
 endif

 " Same as XML indenting for now.
@@ -15,5 +13,3 @@ runtime! indent/xml.vim
 if exists('*XmlIndentGet')
  setlocal indentexpr=XmlIndentGet(v:lnum,0)
 endif
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/eterm.vim
+++ b/runtime/indent/eterm.vim
@@ -1,49 +1,35 @@
 " Vim indent file
-" Language:	    Eterm configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/eterm/
-" Latest Revision:  2004-04-25
-" arch-tag:	    a22a92b1-c59f-4f47-8207-b21db6549b21
+" Language:         Eterm configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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)
-
-  " Check for closing brace on current line
-  if line =~ '^\s*end\>'
+  if getline(v:lnum) =~ '^\s*end\>'
    let ind = ind - &sw
  endif

  return ind
 endfunction
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/ld.vim
+++ b/runtime/indent/ld.vim
@@ -0,0 +1,49 @@
+" Vim indent file
+" Language:         ld(1) script
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetLDIndent()
+setlocal indentkeys=0{,0},!^F,o,O
+
+if exists("*GetLDIndent")
+  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 GetLDIndent()
+  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
--- a/runtime/indent/make.vim
+++ b/runtime/indent/make.vim
@@ -1,21 +1,16 @@
 " Vim indent file
-" Language:	    Makefile
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/make/
-" Latest Revision:  2004-04-25
-" arch-tag:	    b539e147-a05c-4860-98af-1d2436db2f4b
+" Language:         Makefile
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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
-  while i < end
-    if a:line[i] != "\t"
-      let width = width + 1
+  for c in a:line
+    if c == "\t"
+      let width += &ts - (width % &ts)
    else
-      let width = width + &ts - (width % &ts)
+      let width += 1
    endif
-    let i = i + 1
-  endwhile
+  endfor
  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(v:lnum - 1)
-
+  let line = getline(lnum)
  if line == ''
-    let ind = 0
-  elseif line =~ '^[^ \t#:][^#:]*:\{1,2}\([^=:]\|$\)'
-    let ind = ind + &ts
-  elseif line =~ '^\s*\h\w*\s*=\s*.\+\\$'
-    let ind = s:GetStringWidth(line, '=\s*')
+    return 0
+  elseif line =~ '^[^ \t#:][^#:]*:\{1,2}\%([^=:]\|$\)'
+    return indent(lnum) + &ts
+  elseif line =~ '^\s*\h\w*\s*+\==\s*.\+\\$'
+    return s:GetStringWidth(line, '+\==\s*')
  endif
-
-  return ind
 endfunction
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/readline.vim
+++ b/runtime/indent/readline.vim
@@ -1,48 +1,35 @@
 " Vim indent file
-" Language:	    readline configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/readline/
-" Latest Revision:  2004-04-25
-" arch-tag:	    ee681235-3abf-4a42-8587-edabd409a980
+" Language:         readline configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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  line =~ '^\s*$\(if\|else\)\>'
+  if getline(lnum) =~ '^\s*$\(if\|else\)\>'
    let ind = ind + &sw
  endif

-  let line = getline(v:lnum)
-
-  " decrease indent if this line starts with $else or $endif
-  if line =~ '^\s*$\(else\|endif\)\>'
+  if getline(v:lnum) =~ '^\s*$\(else\|endif\)\>'
    let ind = ind - &sw
  endif

  return ind
 endfunction
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/rst.vim
+++ b/runtime/indent/rst.vim
@@ -1,28 +1,22 @@
 " Vim indent file
-" Language:	    reStructuredText Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/rst/
-" Latest Revision:  2004-04-25
-" arch-tag:	    3fe10f75-24d0-4d94-a924-0ce945958104
+" Language:         reStructuredText Documentation Format
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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
@@ -46,7 +40,7 @@ function GetRSTIndent()
      let ind = ind - 2
    elseif line =~ '^\s*\d\+\.\s'
      let ind = ind - matchend(substitute(line, '^\s*', '', ''),
-	    \ '\d\+\.\s\+')
+            \ '\d\+\.\s\+')
    elseif line =~ '^\s*\.\.'
      let ind = ind - 3
    else
@@ -56,5 +50,3 @@ function GetRSTIndent()

  return ind
 endfunction
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -1,33 +1,26 @@
 " Vim indent file
-" Language:	    Shell Script
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/sh/
-" Latest Revision:  2004-04-25
-" arch-tag:	    431c7fc1-12a6-4d71-9636-1498ef56b038
+" Language:         Shell Script
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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,8 +30,8 @@ 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*{'
+        \ || line =~ '^\s*\<\k\+\>\s*()\s*{'
+        \ || line =~ '^\s*{'
    if line !~ '\(esac\|fi\|done\)\>\s*$' && line !~ '}\s*$'
      let ind = ind + &sw
    endif
@@ -48,11 +41,12 @@ function GetShIndent()
  " Retain the indentation level if line matches fin (for find)
  let line = getline(v:lnum)
  if (line =~ '^\s*\(then\|do\|else\|elif\|esac\|fi\|done\)\>' || line =~ '^\s*}')
-	\ && line !~ '^\s*fi[ln]\>'
+        \ && line !~ '^\s*fi[ln]\>'
    let ind = ind - &sw
  endif

  return ind
 endfunction

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/indent/tcl.vim
+++ b/runtime/indent/tcl.vim
@@ -1,27 +1,21 @@
 " Vim indent file
-" Language:	    Tcl
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/tcl/
-" Latest Revision:  2004-05-21
-" arch-tag:	    64fab1fa-d670-40ab-a191-55678f20ceb0
+" Language:         Tcl
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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]
+setlocal indentkeys=0{,0},!^F,o,O,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()
-  let lnum = s:PrevNonBlankNonComment(v:lnum - 1)
+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, 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(lnum)
+  let ind = indent(pnum) + s:count_braces(pnum, 1) * &sw
+  if getline(pnum) =~ '\\$'
+    let ind += &sw
+  endif

-  " 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
-    endif
-    let begin = match(line, '{', begin + 1)
-  endwhile
+  let pnum = s:prevnonblanknoncomment(pnum - 1)
+  if pnum > 0 && getline(pnum) =~ '\\$'
+    let ind -= &sw
+  endif

-  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
-    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
+  return ind - s:count_braces(v:lnum, 0) * &sw
 endfunction
-
-" vim: set sts=2 sw=2:
--- a/runtime/indent/tcsh.vim
+++ b/runtime/indent/tcsh.vim
@@ -1,6 +1,6 @@
 " Vim indent file
 " Language:		C-shell (tcsh)
-" Maintainor:		Gautam Iyer <gautam@math.uchicago.edu>
+" Maintainer:		Gautam Iyer <gautam@math.uchicago.edu>
 " Last Modified:	Wed 04 Feb 2004 04:36:07 PM CST

 " Only load this indent file when no other was loaded.
--- a/runtime/indent/xf86conf.vim
+++ b/runtime/indent/xf86conf.vim
@@ -1,21 +1,16 @@
 " Vim indent file
-" Language:	    XFree86 Configuration File
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/xf86conf/
-" Latest Revision:  2004-04-25
-" arch-tag:	    8a42f7b6-5088-49cf-b15b-07696a91c015
+" Language:         XFree86 Configuration File
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-" 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:
--- a/runtime/indent/xinetd.vim
+++ b/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
--- a/runtime/indent/yacc.vim
+++ b/runtime/indent/yacc.vim
@@ -1,9 +1,7 @@
 " Vim indent file
-" Language:	    YACC input file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/yacc/
-" Latest Revision:  2004-04-25
-" arch-tag:	    629aa719-8fe4-4787-adb7-ae94ca801610
+" Language:         YACC input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

 " 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:
--- a/runtime/indent/zsh.vim
+++ b/runtime/indent/zsh.vim
@@ -1,11 +1,11 @@
 " Vim indent file
-" Language:	    Zsh Shell Script
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/indent/pcp/zsh/
-" Latest Revision:  2004-05-22
-" arch-tag:	    e566f55f-d8c0-4c60-b4b3-60c0dbd6dea1
+" Language:         Zsh Shell Script
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("b:did_indent")
+  finish
+endif

 " Same as sh indenting for now.
 runtime! indent/sh.vim
-
-" vim: set sts=2 sw=2:
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 11
+" Last Change:	2005 Jun 28

 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -413,6 +413,8 @@ if has("spell")
  an 40.335.120 &Tools.&Spelling.Spell\ Check\ &Off		:set nospell<CR>
  an 40.335.130 &Tools.&Spelling.To\ &Next\ error<Tab>]s	]s
  an 40.335.130 &Tools.&Spelling.To\ &Pevious\ error<Tab>[s	[s
+  an 40.335.140 &Tools.&Spelling.Suggest\ &Corrections<Tab>z?	z?
+  an 40.335.150 &Tools.&Spelling.&Repeat\ correction<Tab>:spellrepall	:spellrepall<CR>
  an 40.335.200 &Tools.&Spelling.-SEP1-				<Nop>
  an 40.335.210 &Tools.&Spelling.Set\ language\ to\ "en"	:set spl=en spell<CR>
  an 40.335.220 &Tools.&Spelling.Set\ language\ to\ "en_au"	:set spl=en_au spell<CR>
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Mar 07
+" Last Change:	2005 Jul 01

 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -368,7 +368,7 @@ if has("linebreak")
 endif


-call <SID>Header("syntax and highlighting")
+call <SID>Header("syntax, highlighting and spelling")
 call append("$", "background\t\"dark\" or \"light\"; the background color brightness")
 call <SID>OptionG("bg", &bg)
 if has("autocmd")
@@ -385,6 +385,19 @@ call append("$", "highlight\twhich highlighting to use for various occasions")
 call <SID>OptionG("hl", &hl)
 call append("$", "hlsearch\thighlight all matches for the last used search pattern")
 call <SID>BinOptionG("hls", &hls)
+if has("syntax")
+  call append("$", "spell\thighlight spelling mistakes")
+  call append("$", "\t(local to window)")
+  call <SID>BinOptionL("spell")
+  call append("$", "spelllang\tlist of accepted languages")
+  call append("$", "\t(local to buffer)")
+  call <SID>OptionL("spl")
+  call append("$", "spellfile\tfile that \"zg\" adds good words to")
+  call append("$", "\t(local to buffer)")
+  call <SID>OptionL("spf")
+  call append("$", "spellsuggest\tmethods used to suggest corrections")
+  call <SID>OptionG("sps", &sps)
+endif


 call <SID>Header("multiple windows")
@@ -614,6 +627,8 @@ call append("$", "report\tthreshold for reporting number of changed lines")
 call append("$", " \tset report=" . &report)
 call append("$", "verbose\tthe higher the more messages are given")
 call append("$", " \tset vbs=" . &vbs)
+call append("$", "verbosefile\tfile to write messages in")
+call <SID>OptionG("vfile", &vfile)
 call append("$", "more\tpause listings when the screen is full")
 call <SID>BinOptionG("more", &more)
 if has("dialog_con") || has("dialog_gui")
--- a/runtime/spell/en.ascii.spl
+++ b/runtime/spell/en.ascii.spl
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
--- a/runtime/spell/en.utf-8.spl
+++ b/runtime/spell/en.utf-8.spl
--- a/runtime/syntax/alsaconf.vim
+++ b/runtime/syntax/alsaconf.vim
@@ -1,72 +1,51 @@
 " Vim syntax file
-" Language:	    ALSA configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/
-" Latest Revision:  2004-09-10
-" arch-tag:	    3e06fe53-28d5-44a1-871d-279f22e7aed4
+" Language:         alsaconf(8) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" todo
-syn keyword alsoconfTodo      contained FIXME TODO XXX NOTE
+let s:cpo_save = &cpo
+set cpo&vim

-" comments
-syn region  alsaconfComment   matchgroup=alsaconfComment start="#" end="$"
-			      \ contains=alsaconfTodo
+syn keyword alsoconfTodo        contained FIXME TODO XXX NOTE

-" special characters
-syn match   alsaconfSpecialChar	contained "\\[ntvbrf]"
-syn match   alsaconfSpecialChar	contained "\\\o\+"
+syn region  alsaconfComment     matchgroup=alsaconfComment
+                                \ start='#' end='$'
+                                \ contains=alsaconfTodo,@Spell

-" strings
-syn region  alsaconfString    matchgroup=alsaconfString start=+"+ skip=+\\$+
-			      \ end=+"+ end=+$+ contains=alsaconfSpecialChar
+syn match   alsaconfSpecialChar contained display '\\[ntvbrf]'
+syn match   alsaconfSpecialChar contained display '\\\o\+'

-" preprocessor special
-syn match   alsaconfSpecial   contained "confdir:"
+syn region  alsaconfString      matchgroup=alsaconfString
+                                \ start=+"+ skip=+\\$+ end=+"+ end=+$+
+                                \ contains=alsaconfSpecialChar

-" preprocessor
-syn region  alsaconfPreProc   matchgroup=alsaconfPreProc start="<" end=">"
-			      \ contains=alsaconfSpecial
+syn match   alsaconfSpecial     contained display 'confdir:'

-" modes
-syn match   alsaconfMode      "[+?!-]"
+syn region  alsaconfPreProc     matchgroup=alsaconfPreProc start='<' end='>'
+                                \ contains=alsaconfSpecial

-" keywords
-syn keyword alsaconfKeyword   card default device errors files func strings
-syn keyword alsaconfKeyword   subdevice type vars
+syn match   alsaconfMode        display '[+?!-]'

-" variables
-syn match   alsaconfVariables "@\(hooks\|func\|args\)"
+syn keyword alsaconfKeyword     card default device errors files func strings
+syn keyword alsaconfKeyword     subdevice type vars

-" 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_alsaconf_syn_inits")
-  if version < 508
-    let did_dircolors_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+syn match   alsaconfVariables   display '@\(hooks\|func\|args\)'

-  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
+hi def link alsoconfTodo        Todo
+hi def link alsaconfComment     Comment
+hi def link alsaconfSpecialChar SpecialChar
+hi def link alsaconfString      String
+hi def link alsaconfSpecial     Special
+hi def link alsaconfPreProc     PreProc
+hi def link alsaconfMode        Special
+hi def link alsaconfKeyword     Keyword
+hi def link alsaconfVariables   Identifier

 let b:current_syntax = "alsaconf"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/arch.vim
+++ b/runtime/syntax/arch.vim
@@ -1,60 +1,35 @@
 " Vim syntax file
-" Language:	    GNU Arch inventory file.
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/arch/
-" Latest Revision:  2004-05-22
-" arch-tag:	    529d60c4-53d8-4d3a-80d6-54ada86d9932
+" Language:         GNU Arch inventory file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" Set iskeyword since we need `-' (and potentially others) in keywords.
-" For version 5.x: Set it globally
-" 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,_,-
-delcommand SetIsk
+let s:cpo_save = &cpo
+set cpo&vim

-" Todo
-syn keyword archTodo	  TODO FIXME XXX NOTE
+setlocal iskeyword=@,48-57,_,-

-" Comment
-syn region  archComment  matchgroup=archComment start='^\%(#\|\s\)' end='$' contains=archTodo
+syn keyword archTodo    TODO FIXME XXX NOTE

-" 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 region  archComment display matchgroup=archComment
+                        \ start='^\%(#\|\s\)' end='$' contains=archTodo,@Spell

-" Regexes
-syn match   archRegex    contained '\s*\zs.*'
+syn keyword archKeyword implicit tagline explicit names
+syn keyword archKeyword untagged-source
+syn keyword archKeyword exclude junk backup precious unrecognized source
+                        \ skipwhite nextgroup=archRegex

-" 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_arch_syn_inits")
-  if version < 508
-    let did_arch_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+syn match   archRegex   contained '\s*\zs.*'

-  HiLink archTodo     Todo
-  HiLink archComment  Comment
-  HiLink archKeyword  Keyword
-  HiLink archRegex    String
-
-  delcommand HiLink
-endif
+hi def link archTodo    Todo
+hi def link archComment Comment
+hi def link archKeyword Keyword
+hi def link archRegex   String

 let b:current_syntax = "arch"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/bdf.vim
+++ b/runtime/syntax/bdf.vim
@@ -1,86 +1,97 @@
 " Vim syntax file
-" Language:	    BDF Font definition
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/bdf/
-" Latest Revision:  2004-05-06
-" arch-tag:	    b696b6ba-af24-41ba-b4eb-d248495eca68
+" Language:         BDF font definition
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-27

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" numbers
-syn match   bdfNumber	    display "\<\(\x\+\|\d\+\.\d\+\)\>"
+let s:cpo_save = &cpo
+set cpo&vim

-" comments
-syn region  bdfComment	    start="^COMMENT\>" end="$" contains=bdfTodo
+syn region  bdfFontDefinition transparent matchgroup=bdfKeyword
+                              \ start='^STARTFONT\>' end='^ENDFONT\>'
+                              \ contains=bdfComment,bdfFont,bdfSize,
+                              \ bdfBoundingBox,bdfProperties,bdfChars,bdfChar

-" todo
-syn keyword bdfTodo	    contained TODO FIXME XXX NOTE
+syn match   bdfNumber         contained display
+                              \ '\<\%(\x\+\|[+-]\=\d\+\%(\.\d\+\)*\)'

-" strings
-syn region  bdfString	    start=+"+ skip=+""+ end=+"+
+syn keyword bdfTodo           contained FIXME TODO XXX NOTE

-" properties
-syn keyword bdfProperties   contained FONT SIZE FONTBOUNDINGBOX CHARS
+syn region  bdfComment        contained start='^COMMENT\>' end='$'
+                              \ contains=bdfTodo,@Spell

-" X11 properties
-syn keyword bdfXProperties  contained FONT_ASCENT FONT_DESCENT DEFAULT_CHAR
-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  bdfFont           contained matchgroup=bdfKeyword
+                              \ start='^FONT\>' end='$'

-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 keyword bdfCharProperties contained ENCODING SWIDTH DWIDTH BBX ATTRIBUTES BITMAP
+syn region  bdfBoundingBox    contained transparent matchgroup=bdfKeyword
+                              \ start='^FONTBOUNDINGBOX' end='$'
+                              \ contains=bdfNumber

-syn match   bdfCharName	    contained display "\<[0-9a-zA-Z]\{1,14}\>"
-syn match   bdfCharNameError contained display "\<[0-9a-zA-Z]\{15,}\>"
+syn region  bdfProperties     contained transparent matchgroup=bdfKeyword
+                              \ 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  bdfFontDefinition transparent matchgroup=bdfDelim start="^STARTFONT\>" end="^ENDFONT\>" contains=bdfProperties,bdfDefinition,bdfCharDefinition,bdfNumber,bdfComment
+syn region  bdfString         contained start=+"+ skip=+""+ end=+"+
+
+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
-  HiLink bdfTodo		Todo
-  HiLink bdfNumber		Number
-  HiLink bdfString		String
-  HiLink bdfProperties	Keyword
-  HiLink bdfXProperties	Keyword
-  HiLink bdfCharProperties	Structure
-  HiLink bdfDelim		Delimiter
-  HiLink bdfCharName		String
-  HiLink bdfCharNameError	Error
-  delcommand HiLink
-endif
+hi def link bdfKeyword        Keyword
+hi def link bdfNumber         Number
+hi def link bdfTodo           Todo
+hi def link bdfComment        Comment
+hi def link bdfFont           String
+hi def link bdfProperty       Identifier
+hi def link bdfXProperty      Identifier
+hi def link bdfString         String
+hi def link bdfChars          Keyword
+hi def link bdfBitmap         Keyword

 let b:current_syntax = "bdf"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/calendar.vim
+++ b/runtime/syntax/calendar.vim
@@ -1,104 +1,111 @@
 " Vim syntax file
-" Language:	    calendar(1) file.
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/calendar/
-" Latest Revision:  2004-05-06
-" arch-tag:	    d714127d-469d-43bd-9c79-c2a46ec54535
+" Language:         calendar(1) input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" Todo
-syn keyword calendarTodo	contained TODO FIXME XXX NOTE
+let s:cpo_save = &cpo
+set cpo&vim

-" Comments
-syn region  calendarComment	matchgroup=calendarComment start='/\*' end='\*/' contains=calendarTodo
+syn keyword calendarTodo          contained TODO FIXME XXX NOTE

-" Strings
-syn region  calendarCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl 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}\)"
+syn region  calendarComment       matchgroup=calendarComment
+                                  \ start='/\*' end='\*/'
+                                  \ contains=calendarTodo,@Spell

-" cpp(1) Preprocessor directives (adapted from syntax/c.vim)
+syn region  calendarCppString     start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl
+                                  \ 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}\)"

-syn region  calendarPreCondit	start='^\s*#\s*\%(if\|ifdef\|ifndef\|elif\)\>' skip='\\$' end='$' 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  calendarCppOut2	contained start='0' 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 cluster calendarPreProcGroup    contains=calendarPreCondit,calendarIncluded,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
+syn region  calendarPreCondit     start='^\s*#\s*\%(if\|ifdef\|ifndef\|elif\)\>'
+                                  \ skip='\\$' end='$'
+                                  \ 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  calendarCppOut2       contained start='0'
+                                  \ 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 cluster calendarPreProcGroup  contains=calendarPreCondit,calendarIncluded,
+                                  \ 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 keyword calendarKeyword       CHARSET BODUN LANG
 syn case ignore
-syn keyword calendarKeyword	Easter Pashka
+syn keyword calendarKeyword       Easter Pashka
 syn case match

-" Dates
 syn case ignore
-syn match   calendarNumber	'\<\d\+\>'
-syn keyword calendarMonth	Jan[uary] Feb[ruary] Mar[ch] Apr[il] May Jun[e]
-syn keyword calendarMonth	Jul[y] Aug[ust] Sep[tember] Oct[ober]
-syn keyword calendarMonth	Nov[ember] Dec[ember]
-syn match   calendarMonth	'\<\%(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   calendarWeekdayMod	'[+-]\d\+\>'
+syn match   calendarNumber        display '\<\d\+\>'
+syn keyword calendarMonth         Jan[uary] Feb[ruary] Mar[ch] Apr[il] May
+                                  \ Jun[e] Jul[y] Aug[ust] Sep[tember]
+                                  \ Oct[ober] Nov[ember] Dec[ember]
+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       display '\<\%(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun\)\.'
+                                  \ nextgroup=calendarWeekdayMod
+syn match   calendarWeekdayMod    display '[+-]\d\+\>'
 syn case match

-" Times
-syn match   calendarTime	'\<\%([01]\=\d\|2[0-3]\):[0-5]\d\%(:[0-5]\d\)\='
-syn match   calendarTime	'\<\%(0\=[1-9]\|1[0-2]\):[0-5]\d\%(:[0-5]\d\)\=\s*[AaPp][Mm]'
+syn match   calendarTime          display '\<\%([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]'

-" Variables
-syn match calendarVariable	'\*'
+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.
-" 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_calendar_syn_inits")
-  if version < 508
-    let did_calendar_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink calendarTodo		Todo
-  HiLink calendarComment	Comment
-  HiLink calendarCppString	String
-  HiLink calendarSpecial	SpecialChar
-  HiLink calendarPreCondit	PreCondit
-  HiLink calendarCppOut	Comment
-  HiLink calendarCppOut2	calendarCppOut
-  HiLink calendarCppSkip	calendarCppOut
-  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
+hi def link calendarTodo          Todo
+hi def link calendarComment       Comment
+hi def link calendarCppString     String
+hi def link calendarSpecial       SpecialChar
+hi def link calendarPreCondit     PreCondit
+hi def link calendarCppOut        Comment
+hi def link calendarCppOut2       calendarCppOut
+hi def link calendarCppSkip       calendarCppOut
+hi def link calendarIncluded      String
+hi def link calendarInclude       Include
+hi def link calendarDefine        Macro
+hi def link calendarPreProc       PreProc
+hi def link calendarKeyword       Keyword
+hi def link calendarNumber        Number
+hi def link calendarMonth         String
+hi def link calendarWeekday       String
+hi def link calendarWeekdayMod    Special
+hi def link calendarTime          Number
+hi def link calendarVariable      Identifier

 let b:current_syntax = "calendar"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/context.vim
+++ b/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
--- a/runtime/syntax/crm.vim
+++ b/runtime/syntax/crm.vim
@@ -1,61 +1,42 @@
 " Vim syntax file
-" Language:	    CRM114
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/crm/
-" Latest Revision:  2004-05-22
-" arch-tag:	    a3d3eaaf-4700-44ff-b332-f6c42c036883
+" Language:         CRM114
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-27

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" Todo
-syn keyword crmTodo	    contained TODO FIXME XXX NOTE
+let s:cpo_save = &cpo
+set cpo&vim

-" Comments
-syn region  crmComment	    matchgroup=crmComment start='#' end='$' end='\\#' contains=crmTodo
+syn keyword crmTodo       contained TODO FIXME XXX NOTE

-" Variables
-syn match   crmVariable    ':[*#@]:[^:]\{-1,}:'
+syn region  crmComment    matchgroup=crmComment start='#' end='$' end='\\#'
+                          \ contains=crmTodo,@Spell

-" Special Characters
-syn match   crmSpecial	    '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'
+syn match   crmVariable   display ':[*#@]:[^:]\{-1,}:'

-" 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
+syn match   crmSpecial    display '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'

-" Regexes
-syn region   crmRegex	    matchgroup=crmRegex start='/' skip='\\/' end='/' contains=crmVariable
+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

-" Labels
-syn match   crmLabel	    '^\s*:[[:graph:]]\+:'
+syn region  crmRegex      matchgroup=crmRegex start='/' skip='\\/' end='/'
+                          \ contains=crmVariable

-" 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_crm_syn_inits")
-  if version < 508
-    let did_crm_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+syn match   crmLabel      display '^\s*:[[:graph:]]\+:'

-  HiLink crmTodo	Todo
-  HiLink crmComment	Comment
-  HiLink crmVariable	Identifier
-  HiLink crmSpecial	SpecialChar
-  HiLink crmStatement	Statement
-  HiLink crmRegex	String
-  HiLink crmLabel	Label
-
-  delcommand HiLink
-endif
+hi def link crmTodo       Todo
+hi def link crmComment    Comment
+hi def link crmVariable   Identifier
+hi def link crmSpecial    SpecialChar
+hi def link crmStatement  Statement
+hi def link crmRegex      String
+hi def link crmLabel      Label

 let b:current_syntax = "crm"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/cvsrc.vim
+++ b/runtime/syntax/cvsrc.vim
@@ -1,49 +1,39 @@
 " Vim syntax file
-" Language:	    CVS RC File
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/syntax/pcp/cvsrc/
-" Latest Revision:  2004-05-06
-" arch-tag:	    1910f2a8-66f4-4dde-9d1a-297566934535
+" Language:         cvs(1) RC file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" strings
-syn region  cvsrcString	    start=+"+ skip=+\\\\\|\\\\"+ end=+"\|$+
-syn region  cvsrcString	    start=+'+ skip=+\\\\\|\\\\'+ end=+'\|$+
+let s:cpo_save = &cpo
+set cpo&vim

-" numbers
-syn match   cvsrcNumber	    "\<\d\+\>"
+syn region  cvsrcString   display start=+"+ skip=+\\\\\|\\\\"+ end=+"\|$+
+syn region  cvsrcString   display start=+'+ skip=+\\\\\|\\\\'+ end=+'\|$+

-" commands
-syn match   cvsrcBegin	    "^" nextgroup=cvsrcCommand skipwhite
+syn match   cvsrcNumber   display '\<\d\+\>'

-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 match   cvsrcOption	    "-\a\+"
+syn region  cvsrcCommand  contained transparent matchgroup=cvsrcCommand
+                          \ 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.
-" 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
+syn match   cvsrcOption   contained display '-\a\+'

-  HiLink cvsrcString	String
-  HiLink cvsrcNumber	Number
-  HiLink cvsrcCommand	Keyword
-  HiLink cvsrcOption	Identifier
-  delcommand HiLink
-endif
+hi def link cvsrcString   String
+hi def link cvsrcNumber   Number
+hi def link cvsrcCommand  Keyword
+hi def link cvsrcOption   Identifier

 let b:current_syntax = "cvsrc"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/dircolors.vim
+++ b/runtime/syntax/dircolors.vim
@@ -1,106 +1,746 @@
 " Vim syntax file
-" Language:	    dircolors(1) input file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/dircolors/
-" Latest Revision:  2004-05-22
-" arch-tag:	    995e2983-2a7a-4f1e-b00d-3fdf8e076b40
-" Color definition coloring implemented my Mikolaj Machowski <mikmach@wp.pl>
+" Language:         dircolors(1) input file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-27

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" todo
-syn keyword dircolorsTodo	contained FIXME TODO XXX NOTE
+let s:cpo_save = &cpo
+set cpo&vim

-" comments
-syn region  dircolorsComment	start="#" end="$" contains=dircolorsTodo
+syn keyword dircolorsTodo       contained FIXME TODO XXX NOTE

-" numbers
-syn match   dircolorsNumber	"\<\d\+\>"
+syn region  dircolorsComment    start='#' end='$' contains=dircolorsTodo,@Spell
+
+syn keyword dircolorsKeyword    TERM LEFT LEFTCODE RIGHT RIGHTCODE END ENDCODE
+
+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
+  syn keyword dircolorsKeyword  COLOR OPTIONS EIGHTBIT
 endif

-" extensions
-syn match   dircolorsExtension	"^\s*\zs[.*]\S\+"
+syn match   dircolorsExtension  '^\s*\zs[.*]\S\+'
+                                \ nextgroup=@dircolorsColors skipwhite

-" colors
-syn match dircolors01 "\<01\>"
-syn match dircolors04 "\<04\>"
-syn match dircolors05 "\<05\>"
-syn match dircolors07 "\<07\>"
-syn match dircolors08 "\<08\>"
-syn match dircolors30 "\<30\>"
-syn match dircolors31 "\<31\>"
-syn match dircolors32 "\<32\>"
-syn match dircolors33 "\<33\>"
-syn match dircolors34 "\<34\>"
-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\>"
+if &t_Co == 8 || &t_Co == 16
+  syn cluster dircolorsColors   contains=dircolorsBold,dircolorsUnderline,
+                                \ dircolorsBlink,dircolorsReverse,
+                                \ dircolorsInvisible,dircolorsBlack,
+                                \ dircolorsRed,dircolorsGreen,dircolorsYellow,
+                                \ dircolorsBlue,dircolorsMagenta,dircolorsCyan,
+                                \ dircolorsWhite,dircolorsBGBlack,
+                                \ dircolorsBGRed,dircolorsBGGreen,
+                                \ dircolorsBGYellow,dircolorsBGBlue,
+                                \ dircolorsBGMagenta,dircolorsBGCyan,
+                                \ dircolorsBGWhite

-" 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_dircolors_syn_inits")
-  if version < 508
-    let did_dircolors_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
+  syn match dircolorsBold       contained '\<01\>'
+  syn match dircolorsUnderline  contained '\<04\>'
+  syn match dircolorsBlink      contained '\<05\>'
+  syn match dircolorsReverse    contained '\<07\>'
+  syn match dircolorsInvisible  contained '\<08\>'
+  syn match dircolorsBlack      contained '\<30\>'
+  syn match dircolorsRed        contained '\<31\>'
+  syn match dircolorsGreen      contained '\<32\>'
+  syn match dircolorsYellow     contained '\<33\>'
+  syn match dircolorsBlue       contained '\<34\>'
+  syn match dircolorsMagenta    contained '\<35\>'
+  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
-  HiLink dircolorsComment	Comment
-  HiLink dircolorsNumber	Number
-  HiLink dircolorsKeyword	Keyword
-  HiLink dircolorsExtension	Keyword
+  syn match dircolorsColor1     contained '\<1\>'
+  syn match dircolorsColor2     contained '\<2\>'
+  syn match dircolorsColor3     contained '\<3\>'
+  syn match dircolorsColor4     contained '\<4\>'
+  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
-  HiDef dircolors04		term=underline cterm=underline gui=underline
-  "    HiDef dircolors05
-  HiDef dircolors07		term=reverse cterm=reverse gui=reverse
-  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
+hi def link dircolorsTodo       Todo
+hi def link dircolorsComment    Comment
+hi def link dircolorsKeyword    Keyword
+hi def link dircolorsExtension  Keyword

-  delcommand HiLink
-  delcommand HiDef
+if &t_Co == 8 || &t_Co == 16
+  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
--- a/runtime/syntax/elinks.vim
+++ b/runtime/syntax/elinks.vim
@@ -1,54 +1,40 @@
 " Vim syntax file
-" Language:	    elinks(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/
-" Latest Revision:  2004-05-22
-" arch-tag:	    74eaff55-cdb5-4d31-805b-9627eb6535f1
+" Language:         elinks(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-27

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" Set iskeyword since we need `-' (and potentially others) in keywords.
-" For version 5.x: Set it globally
-" 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,_,-
-delcommand SetIsk
+let s:cpo_save = &cpo
+set cpo&vim

-" Todo
-syn keyword elinksTodo	    contained TODO FIXME XXX NOTE
+setlocal iskeyword=@,48-57,_,-

-" Comments
-syn region  elinksComment   matchgroup=elinksComment start='#' end='$' contains=elinksTodo
+syn keyword elinksTodo      contained TODO FIXME XXX NOTE
+
+syn region  elinksComment   matchgroup=elinksComment start='#' end='$'
+                            \ contains=elinksTodo

-" Numbers
 syn match   elinksNumber    '\<\d\+\>'

-" Strings
-syn region  elinksString    matchgroup=elinksString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@elinksColor
+syn region  elinksString    matchgroup=elinksString start=+"+
+                            \ 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
-syn keyword elinksOptions   unrestartable_receive_timeout
+                            \ max_connections_to_host receive_timeout retries
+                            \ 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
-syn keyword elinksOptions   image_link_tagging image_link_prefix
-syn keyword elinksOptions   image_link_suffix show_as_links show_any_as_links
-syn keyword elinksOptions   background text enable_color bold invert underline
-syn keyword elinksOptions   color_dirs numbering use_tabindex
-syn keyword elinksOptions   number_keys_select_link wraparound case regex
-syn keyword elinksOptions   show_hit_top_bottom wraparound show_not_found
-syn keyword elinksOptions   margin_width refresh minimum_refresh_time
-syn keyword elinksOptions   scroll_margin scroll_step table_move_order size
-syn keyword elinksOptions   size cache_redirects ignore_cache_control assume
-syn keyword elinksOptions   force_assumed text background link vlink dirs
-syn keyword elinksOptions   allow_dark_on_black ensure_contrast
-syn keyword elinksOptions   use_document_colors directory set_original_time
-syn keyword elinksOptions   overwrite notify_bell codepage width enable
-syn keyword elinksOptions   max_items display_type write_interval
-syn keyword elinksOptions   keep_unhistory display_frames display_tables
-syn keyword elinksOptions   expand_table_columns display_subs display_sups
-syn keyword elinksOptions   link_display underline_links wrap_nbsp
-syn keyword elinksOptions   display_links compress_empty_lines
+                            \ input_size show_formhist file_tags
+                            \ image_link_tagging image_link_prefix
+                            \ image_link_suffix show_as_links
+                            \ show_any_as_links background text enable_color
+                            \ bold invert underline color_dirs numbering
+                            \ use_tabindex number_keys_select_link
+                            \ wraparound case regex show_hit_top_bottom
+                            \ wraparound show_not_found margin_width refresh
+                            \ minimum_refresh_time scroll_margin scroll_step
+                            \ table_move_order size size cache_redirects
+                            \ ignore_cache_control assume force_assumed text
+                            \ background link vlink dirs allow_dark_on_black
+                            \ ensure_contrast use_document_colors directory
+                            \ set_original_time overwrite notify_bell
+                            \ codepage width enable max_items display_type
+                            \ write_interval keep_unhistory display_frames
+                            \ display_tables expand_table_columns display_subs
+                            \ display_sups link_display underline_links
+                            \ 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
-syn keyword elinksOptions   use_epsv accept_charset allow_blacklist
-syn keyword elinksOptions   broken_302_redirect post_no_keepalive http10 host
-syn keyword elinksOptions   user passwd policy fake accept_language
-syn keyword elinksOptions   accept_ui_language trace user_agent host
-syn keyword elinksOptions   enable-dumb enable-smart
+                            \ try_encoding_extensions host anon_passwd
+                            \ use_pasv use_epsv accept_charset allow_blacklist
+                            \ broken_302_redirect post_no_keepalive http10
+                            \ host user passwd policy fake accept_language
+                            \ accept_ui_language trace user_agent host
+                            \ 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
-syn keyword elinksPrefix    scrollbar scrollbar-selected title text checkbox
-syn keyword elinksPrefix    checkbox-label button button-selected field
-syn keyword elinksPrefix    field-text meter shadow title title-bar title-text
-syn keyword elinksPrefix    status status-bar status-text tabs unvisited normal
-syn keyword elinksPrefix    loading separator searched mono
+                            \ menu marked hotkey frame dialog generic
+                            \ frame scrollbar scrollbar-selected title text
+                            \ checkbox checkbox-label button button-selected
+                            \ field field-text meter shadow title title-bar
+                            \ title-text status status-bar status-text tabs
+                            \ 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
-syn keyword elinksOptions   homepage show_bar wraparound confirm_close enable
-syn keyword elinksOptions   duration action language show_status_bar
-syn keyword elinksOptions   show_title_bar startup_goto_dialog success_msgbox
-syn keyword elinksOptions   window_title
+                            \ auto_save auto_restore auto_save_foldername
+                            \ homepage show_bar wraparound confirm_close
+                            \ enable duration action language show_status_bar
+                            \ show_title_bar startup_goto_dialog
+                            \ success_msgbox window_title

 syn keyword elinksOptions   secure_file_saving

-" Colors
-syn cluster elinksColor contains=elinksColorBlack,elinksColorDarkRed,elinksColorDarkGreen,elinksColorDarkYellow,elinksColorDarkBlue,elinksColorDarkMagenta,elinksColorDarkCyan,elinksColorGray,elinksColorDarkGray,elinksColorRed,elinksColorGreen,elinksColorYellow,elinksColorBlue,elinksColorMagenta,elinksColorCyan,elinksColorWhite
+syn cluster elinksColor     contains=elinksColorBlack,elinksColorDarkRed,
+                            \ elinksColorDarkGreen,elinksColorDarkYellow,
+                            \ elinksColorDarkBlue,elinksColorDarkMagenta,
+                            \ elinksColorDarkCyan,elinksColorGray,
+                            \ elinksColorDarkGray,elinksColorRed,
+                            \ elinksColorGreen,elinksColorYellow,
+                            \ elinksColorBlue,elinksColorMagenta,
+                            \ elinksColorCyan,elinksColorWhite

-syn keyword elinksColorBlack	    black contained
-syn keyword elinksColorDarkRed	    darkred sandybrown maroon crimson firebrick contained
-syn keyword elinksColorDarkGreen    darkgreen darkolivegreen darkseagreen contained
-syn keyword elinksColorDarkGreen    forestgreen mediumspringgreen seagreen contained
-syn keyword elinksColorDarkYellow   brown blanchedalmond chocolate darkorange contained
-syn keyword elinksColorDarkYellow   darkgoldenrod orange rosybrown saddlebrown contained
-syn keyword elinksColorDarkYellow   peru olive olivedrab sienna contained
-syn keyword elinksColorDarkBlue	    darkblue cadetblue cornflowerblue contained
-syn keyword elinksColorDarkBlue	    darkslateblue deepskyblue midnightblue contained
-syn keyword elinksColorDarkBlue	    royalblue steelblue navy contained
-syn keyword elinksColorDarkMagenta  darkmagenta mediumorchid mediumpurple contained
-syn keyword elinksColorDarkMagenta  mediumslateblue slateblue deeppink hotpink contained
-syn keyword elinksColorDarkMagenta  darkorchid orchid purple indigo contained
-syn keyword elinksColorDarkCyan	    darkcyan mediumaquamarine mediumturquoise contained
-syn keyword elinksColorDarkCyan	    darkturquoise teal contained
-syn keyword elinksColorGray	    silver dimgray lightslategray slategray contained
-syn keyword elinksColorGray	    lightgrey burlywood plum tan thistle contained
+syn keyword elinksColorBlack        contained black
+syn keyword elinksColorDarkRed      contained darkred sandybrown maroon crimson
+                                    \ firebrick
+syn keyword elinksColorDarkGreen    contained darkgreen darkolivegreen
+                                    \ darkseagreen forestgreen
+                                    \ mediumspringgreen seagreen
+syn keyword elinksColorDarkYellow   contained brown blanchedalmond chocolate
+                                    \ darkorange darkgoldenrod orange rosybrown
+                                    \ saddlebrown peru olive olivedrab sienna
+syn keyword elinksColorDarkBlue     contained darkblue cadetblue cornflowerblue
+                                    \ darkslateblue deepskyblue midnightblue
+                                    \ royalblue steelblue navy
+syn keyword elinksColorDarkMagenta  contained darkmagenta mediumorchid
+                                    \ mediumpurple mediumslateblue slateblue
+                                    \ deeppink hotpink darkorchid orchid purple
+                                    \ indigo
+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
-syn keyword elinksColorRed	    red indianred orangered tomato lightsalmon contained
-syn keyword elinksColorRed	    salmon coral lightcoral contained
-syn keyword elinksColorGreen	    green greenyellow lawngreen lightgreen contained
-syn keyword elinksColorGreen	    lightseagreen limegreen mediumseagreen contained
-syn keyword elinksColorGreen	    springgreen yellowgreen palegreen lime contained
-syn keyword elinksColorGreen	    chartreuse contained
-syn keyword elinksColorYellow	    yellow beige darkkhaki lightgoldenrodyellow contained
-syn keyword elinksColorYellow	    palegoldenrod gold goldenrod khaki contained
-syn keyword elinksColorYellow	    lightyellow contained
-syn keyword elinksColorBlue	    blue aliceblue aqua aquamarine azure contained
-syn keyword elinksColorBlue	    dodgerblue lightblue lightskyblue contained
-syn keyword elinksColorBlue	    lightsteelblue mediumblue contained
-syn keyword elinksColorMagenta	    magenta darkviolet blueviolet lightpink contained
-syn keyword elinksColorMagenta	    mediumvioletred palevioletred violet pink contained
-syn keyword elinksColorMagenta	    fuchsia contained
-syn keyword elinksColorCyan	    cyan lightcyan powderblue skyblue turquoise contained
-syn keyword elinksColorCyan	    paleturquoise contained
-syn keyword elinksColorWhite	    white antiquewhite floralwhite ghostwhite contained
-syn keyword elinksColorWhite	    navajowhite whitesmoke linen lemonchiffon contained
-syn keyword elinksColorWhite	    cornsilk lavender lavenderblush seashell contained
-syn keyword elinksColorWhite	    mistyrose ivory papayawhip bisque gainsboro contained
-syn keyword elinksColorWhite	    honeydew mintcream moccasin oldlace contained
-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
+hi def link elinksTodo              Todo
+hi def link elinksComment           Comment
+hi def link elinksNumber            Number
+hi def link elinksString            String
+hi def link elinksKeyword           Keyword
+hi def link elinksPrefix            Identifier
+hi def link elinksOptions           Identifier
+hi def      elinksColorBlack        ctermfg=Black       guifg=Black
+hi def      elinksColorDarkRed      ctermfg=DarkRed     guifg=DarkRed
+hi def      elinksColorDarkGreen    ctermfg=DarkGreen   guifg=DarkGreen
+hi def      elinksColorDarkYellow   ctermfg=DarkYellow  guifg=DarkYellow
+hi def      elinksColorDarkBlue     ctermfg=DarkBlue    guifg=DarkBlue
+hi def      elinksColorDarkMagenta  ctermfg=DarkMagenta guifg=DarkMagenta
+hi def      elinksColorDarkCyan     ctermfg=DarkCyan    guifg=DarkCyan
+hi def      elinksColorGray         ctermfg=Gray        guifg=Gray
+hi def      elinksColorDarkGray     ctermfg=DarkGray    guifg=DarkGray
+hi def      elinksColorRed          ctermfg=Red         guifg=Red
+hi def      elinksColorGreen        ctermfg=Green       guifg=Green
+hi def      elinksColorYellow       ctermfg=Yellow      guifg=Yellow
+hi def      elinksColorBlue         ctermfg=Blue        guifg=Blue
+hi def      elinksColorMagenta      ctermfg=Magenta     guifg=Magenta
+hi def      elinksColorCyan         ctermfg=Cyan        guifg=Cyan
+hi def      elinksColorWhite        ctermfg=White       guifg=White

 let b:current_syntax = "elinks"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/syntax/eterm.vim
+++ b/runtime/syntax/eterm.vim
@@ -1,200 +1,428 @@
 " Vim syntax file
-" Language:	    Eterm configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/eterm/
-" Latest Revision:  2004-05-06
-" arch-tag:	    f4c58caf-2b91-4fc4-96af-e3cad7c70e6b
+" Language:         eterm(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" magic number
-syn match   etermMagic		display "^<Eterm-[0-9.]\+>$"
+let s:cpo_save = &cpo
+set cpo&vim

-" comments
-syn region  etermComment	matchgroup=etermComment start="^#" end="$" contains=etermTodo
+syn keyword etermTodo             contained TODO FIXME XXX NOTE

-" todo
-syn keyword etermTodo		contained TODO FIXME XXX NOTE
+syn region  etermComment          matchgroup=etermComment start='^#' end='$'
+                                  \ contains=etermTodo,@Spell

-" numbers
-syn match   etermNumber		contained display "\<\(\d\+\|0x\x\{1,2}\)\>"
+syn match   etermMagic            display display '^<Eterm-[0-9.]\+>$'

-" strings
-syn region  etermString		contained display oneline start=+"+ skip=+\\"+ end=+"+
+syn match   etermNumber           contained display '\<\(\d\+\|0x\x\{1,2}\)\>'

-" booleans
-syn keyword etermBoolean	contained on off true false yes no
+syn region  etermString           contained display oneline start=+"+
+                                  \ skip=+\\"+ end=+"+

-" colors (not pretty, but can't figure out better way...)
-syn match   etermColor		contained display "\s\+#\x\{6}\>"
-syn keyword etermColor		contained white black
+syn keyword etermBoolean          contained on off true false yes no

-" preproc
-syn match   etermPreProc	contained "%\(appname\|exec\|get\|put\|random\|version\|include\|preproc\)("he=e-1
+syn keyword etermPreProc          contained appname exec get put random version
+                                  \ include preproc

-" functions
-syn match   etermFunctions	contained "\<\(copy\|exit\|kill\|nop\|paste\|save\|scroll\|search\|spawn\)("
+syn keyword etermFunctions        contained copy exit kill nop paste save
+                                  \ scroll search spawn

-" and make it easy to refer to the above...
-syn cluster etermGeneral	contains=etermComment,etermNumber,etermString,etermBoolean,etermColor,etermFunction,etermPreProc
+syn cluster etermGeneral          contains=etermComment,etermFunction,
+                                  \ etermPreProc

-" key modifiers
-syn keyword etermKeyMod		contained ctrl shift lock mod1 mod2 mod3 mod4 mod5 alt meta anymod
-syn keyword etermKeyMod		contained button1 button2 button3 button4 button5
+syn keyword etermKeyMod           contained ctrl shift lock mod1 mod2 mod3 mod4
+                                  \ mod5 alt meta anymod
+syn keyword etermKeyMod           contained button1 button2 button3 button4
+                                  \ button5

-" color context
-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 keyword etermColorOptions     contained video nextgroup=etermVideoOptions
+                                  \ skipwhite

-syn region  etermColorContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+color\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermColorOptions
+syn keyword etermVideoType        contained normal reverse

-" attributes context
-syn region  etermAttrOptions	contained oneline matchgroup=etermOption start="^\s*geometry\>" matchgroup=etermType end="\<\d\+x\d\++\d\++\d\+\>"
-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 keyword etermColorOptions     contained foreground background cursor
+                                  \ cursor_text pointer
+                                  \ nextgroup=etermColorType skipwhite

-syn region  etermAttrContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+attributes\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermAttrOptions
+syn keyword etermColorType        contained bd ul
+syn match   etermColorType        contained display '\<\%(\d\|1[0-5]\)'

-" image context
-" image types
-syn keyword etermImageTypes	contained background trough anchor up_arrow
-syn keyword etermImageTypes	contained left_arrow right_arrow menu menuitem
-syn keyword etermImageTypes	contained submenu button buttonbar down_arrow
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*type\>" end="$" contains=etermImageTypes
-" image modes
-syn keyword etermImageModes	contained image trans viewport auto solid
-syn keyword etermImageModesAllow contained allow
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*mode\>" end="$" contains=etermImageModes,etermImageModesAllow
-" image states
-syn region  etermImageOptions	contained transparent oneline matchgroup=etermOption start="^\s*state\>" matchgroup=etermType end="\<\(normal\|selected\|clicked\|disabled\)\>"
-" 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 keyword etermColorOptions     contained color
+                                  \ nextgroup=etermColorNumber skipwhite

-syn region  etermImageContext	contained transparent fold matchgroup=etermContext start="^\s*begin\s\+image\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermImageOptions
+syn keyword etermColorNumber      contained bd ul nextgroup=etermColorSpec
+                                  \ skipwhite
+syn match   etermColorNumber      contained display '\<\%(\d\|1[0-5]\)'
+                                  \ nextgroup=etermColorSpec skipwhite

-" imageclasses context
-syn keyword etermIClassOptions	contained icon cache path anim
+syn match   etermColorSpec        contained display '\S\+'

-syn region  etermIClassContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+imageclasses\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermImageContext,etermIClassOptions
+syn region  etermColorContext     fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+color'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermColorOptions

-" menuitem context
-syn region  etermMenuItemOptions contained transparent oneline matchgroup=etermOption start="^\s*action\>" matchgroup=etermType end="\<string\|echo\|submenu\|script\|separator\>"
-syn keyword etermMenuItemOptions contained text rtext
+syn keyword etermAttrOptions      contained geometry nextgroup=etermGeometry
+                                  \ skipwhite

-syn region  etermMenuItemContext fold transparent matchgroup=etermContext start="^\s*begin\s\+menuitem\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMenuItemOptions
+syn match   etermGeometry         contained display '\d\+x\d++\d\++\d\+'

-" menu context (should contain - as well, but no...)
-syn keyword etermMenuOptions    contained title font_name sep
+syn keyword etermAttrOptions      contained scrollbar_type
+                                  \ nextgroup=etermScrollbarType 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 etermScrollbarType    contained motif xterm next

-" action context
-syn match   etermActionDef	contained "\<\(to\|string\|echo\|menu\|script\)\>"
-syn region  etermActionsOptions	contained transparent oneline matchgroup=etermOption start="^\s*bind\>" end="$" contains=etermActionDef,etermKeyMod
+syn keyword etermAttrOptions      contained font nextgroup=etermFontType
+                                  \ skipwhite

-syn region  etermActionsContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+actions\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermActionsOptions
+syn keyword etermFontType         contained bold nextgroup=etermFont skipwhite
+syn match   etermFontType         contained display '[0-5]' nextgroup=etermFont
+                                  \ skipwhite

-" button bar context
-syn match   etermButtonDef	contained "\<\(action\|string\|echo\|menu\|scrupt\)\>"
-syn region  etermButtonOptions	contained transparent oneline matchgroup=etermOption start="^\s*button\>" end="$" contains=etermButtonDef
-syn keyword etermButtonOptions	contained font visible dock
+syn match   etermFont             contained display '\S\+'

-syn region  etermButtonContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+button_bar\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermButtonOptions
+syn keyword etermFontType         contained default nextgroup=etermNumber
+                                  \ skipwhite

-" multichar context
-syn keyword etermMultiOptions	contained encoding font
+syn keyword etermFontType         contained proportional nextgroup=etermBoolean
+                                  \ skipwhite

-syn region  etermMultiContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+multichar\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMultiOptions
+syn keyword etermFontType         contained fx nextgroup=etermString skipwhite

-" xim context
-syn keyword etermXimOptions     contained input_method preedit_type
+syn keyword etermAttrOptions      contained title name iconname
+                                  \ nextgroup=etermString skipwhite

-syn region  etermXimContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+xim\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermXimOptions
+syn keyword etermAttrOptions      contained scrollbar_width desktop
+                                  \ nextgroup=etermNumber skipwhite

-" toggles context
-syn keyword etermTogOptions	contained map_alert visual_bell login_shell scrollbar utmp_logging meta8 iconic no_input
-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  etermAttrContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+attributes\'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermAttrOptions

-syn region  etermTogContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+toggles\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermTogOptions
+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

-" keyboard context
-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  etermIClassContext    fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+imageclasses'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermImageContext,
+                                  \ etermIClassOptions

-syn region  etermKeyboardContext fold transparent  matchgroup=etermContext start="^\s*begin\s\+keyboard\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermKeyboardOptions
+syn keyword etermImageOptions     contained type nextgroup=etermImageType
+                                  \ skipwhite

-" misc context
-syn keyword etermMiscOptions	contained print_pipe save_lines cut_chars min_anchor_size
-syn keyword etermMiscOptions	contained border_width line_space finished_title term_name
-syn keyword etermMiscOptions	contained finished_text exec
+syn keyword etermImageTypes       contained background trough anchor up_arrow
+                                  \ left_arrow right_arrow menu menuitem
+                                  \ submenu button buttonbar down_arrow

-syn region  etermMiscContext	fold transparent  matchgroup=etermContext start="^\s*begin\s\+misc\s*$" end="^\s*end\>\(\s\+.\{-0,}\)\=$" contains=@etermGeneral,etermMiscOptions
+syn keyword etermImageOptions     contained mode nextgroup=etermImageModes
+                                  \ skipwhite
+
+syn keyword etermImageModes       contained image trans viewport auto solid
+                                  \ nextgroup=etermImageModesAllow skipwhite
+syn keyword etermImageModesAllow  contained allow nextgroup=etermImageModesR
+                                  \ skipwhite
+syn keyword etermImageModesR      contained image trans viewport auto solid
+
+syn keyword etermImageOptions     contained state nextgroup=etermImageState
+                                  \ skipwhite
+
+syn keyword etermImageState       contained normal selected clicked disabled
+
+syn keyword etermImageOptions     contained color nextgroup=etermImageColorFG
+                                  \ skipwhite
+
+syn keyword etermImageColorFG     contained '\S\+' nextgroup=etermImageColorBG
+                                  \ skipwhite
+
+syn keyword etermImageColorBG     contained '\S\+'
+
+syn keyword etermImageOptions     contained file nextgroup=etermString
+                                  \ skipwhite
+
+syn keyword etermImageOptions     contained geom nextgroup=etermImageGeom
+                                  \ skipwhite
+
+syn match   etermImageGeom        contained display
+                                  \ '\s\+\%(\d\+x\d\++\d\++\d\+\)\=:\%(\%(tie\|scale\|hscale\|vscale\|propscale\)d\=\)\='
+
+syn keyword etermImageOptions     contained cmod colormod
+                                  \ nextgroup=etermImageCmod skipwhite
+
+syn keyword etermImageCmod        contained image red green blue
+                                  \ nextgroup=etermImageBrightness skipwhite
+
+syn match   etermImageBrightness  contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageContrast skipwhite
+
+syn match   etermImageContrast    contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageGamma skipwhite
+
+syn match   etermImageGamma       contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageGamma skipwhite
+
+syn region  etermImageOptions     contained matchgroup=etermImageOptions
+                                  \ start='border\|bevel\%(\s\+\%(up\|down\)\)\|padding'
+                                  \ end='$' contains=etermNumber
+
+syn region  etermImageContext     contained fold transparent
+                                  \ matchgroup=etermContext
+                                  \ start='^\s*begin\s\+image'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermImageOptions
+
+syn keyword etermMenuItemOptions  contained action
+                                  \ nextgroup=etermMenuItemAction skipwhite
+
+syn keyword etermMenuItemAction   contained string echo submenu script
+                                  \ nextgroup=etermString skipwhite
+
+syn keyword etermMenuItemAction   contained separator
+
+syn keyword etermMenuItemOptions  contained text rtext nextgroup=etermString
+                                  \ skipwhite
+
+syn region  etermMenuItemContext  contained fold transparent
+                                  \ matchgroup=etermContext
+                                  \ start='^\s*begin\s\+menuitem'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMenuItemOptions
+
+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.
-" 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_eterm_syn_inits")
-  if version < 508
-    let did_eterm_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink etermMagic		Special
-  HiLink etermComment		Comment
-  HiLink etermTodo		Todo
-  HiLink etermNumber		Number
-  HiLink etermString		String
-  HiLink etermBoolean		Boolean
-  HiLink etermColor		Number
-  HiLink etermPreProc		PreProc
-  HiLink etermFunctions    	Function
-  HiLink etermKeyMod		Special
-  HiLink etermContext		Keyword
-  HiLink etermOption		Keyword
-  HiLink etermType		Type
-  HiLink etermColorOptions	Keyword
-  HiLink etermAttrOptions	Keyword
-  HiLink etermIClassOptions	Keyword
-  HiLink etermImageTypes	Type
-  HiLink etermImageModes	Type
-  HiLink etermImageModesAllow	Keyword
-  HiLink etermImageOptions	Keyword
-  HiLink etermMenuOptions	Keyword
-  HiLink etermMenuItemOptions	Keyword
-  HiLink etermActionDef	Type
-  HiLink etermActionsOptions	Keyword
-  HiLink etermButtonDef	Type
-  HiLink etermButtonOptions	Keyword
-  HiLink etermMultiOptions	Keyword
-  HiLink etermXimOptions	Keyword
-  HiLink etermTogOptions	Keyword
-  HiLink etermKeyboardOptions	Keyword
-  HiLink etermMiscOptions	Keyword
-  delcommand HiLink
-endif
+hi def link etermTodo             Todo
+hi def link etermComment          Comment
+hi def link etermMagic            PreProc
+hi def link etermNumber           Number
+hi def link etermString           String
+hi def link etermBoolean          Boolean
+hi def link etermPreProc          PreProc
+hi def link etermFunctions        Function
+hi def link etermKeyMod           Constant
+hi def link etermOption           Keyword
+hi def link etermColorOptions     etermOption
+hi def link etermColor            String
+hi def link etermVideoType        Type
+hi def link etermColorType        Type
+hi def link etermColorNumber      Number
+hi def link etermColorSpec        etermColor
+hi def link etermContext          Keyword
+hi def link etermAttrOptions      etermOption
+hi def link etermGeometry         String
+hi def link etermScrollbarType    Type
+hi def link etermFontType         Type
+hi def link etermIClassOptions    etermOption
+hi def link etermImageOptions     etermOption
+hi def link etermImageTypes       Type
+hi def link etermImageModes       Type
+hi def link etermImageModesAllow  Keyword
+hi def link etermImageModesR      Type
+hi def link etermImageState       Keyword
+hi def link etermImageColorFG     etermColor
+hi def link etermImageColorBG     etermColor
+hi def link etermImageGeom        String
+hi def link etermImageCmod        etermOption
+hi def link etermImageBrightness  Number
+hi def link etermImageContrast    Number
+hi def link etermImageGamma       Number
+hi def link etermMenuItemOptions  etermOption
+hi def link etermMenuItemAction   Keyword
+hi def link etermMenuOptions      etermOption
+hi def link etermBind             Keyword
+hi def link etermBindMods         Identifier
+hi def link etermBindTo           Keyword
+hi def link etermBindType         Type
+hi def link etermBindParam        String
+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
--- a/runtime/syntax/fetchmail.vim
+++ b/runtime/syntax/fetchmail.vim
@@ -1,88 +1,74 @@
 " Vim syntax file
-" Language:	    fetchmail(1) RC File
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/fetchmail/
-" Latest Revision:  2004-05-06
-" arch-tag:	    59d8adac-6e59-45f6-88cb-f9ba1e009c1f
+" Language:         fetchmail(1) RC File
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-27

-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
  finish
 endif

-" todo
-syn keyword fetchmailTodo	contained FIXME TODO XXX NOTE
+let s:cpo_save = &cpo
+set cpo&vim

-" comments
-syn region  fetchmailComment	start="#" end="$" contains=fetchmailTodo
+syn keyword fetchmailTodo       contained FIXME TODO XXX NOTE

-" numbers
-syn match   fetchmailNumber	"\<\d\+\>"
+syn region  fetchmailComment    start='#' end='$' contains=fetchmailTodo,@Spell

-" strings
-syn region  fetchmailString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=fetchmailStringEsc
-syn region  fetchmailString	start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=fetchmailStringEsc
+syn match   fetchmailNumber     display '\<\d\+\>'

-" escape characters in strings
-syn match   fetchmailStringEsc	"\\\([ntb]\|0\d*\|x\x\+\)"
+syn region  fetchmailString     start=+"+ skip=+\\\\\|\\"+ end=+"+
+                                \ contains=fetchmailStringEsc
+syn region  fetchmailString     start=+'+ skip=+\\\\\|\\'+ end=+'+
+                                \ contains=fetchmailStringEsc

-" server entries
-syn region  fetchmailKeyword	transparent matchgroup=fetchmailKeyword start="\<poll\|skip\|defaults\>" end="\<poll\|skip\|defaults\>" contains=ALLBUT,fetchmailOptions,fetchmailSet
+syn match   fetchmailStringEsc  contained '\\\([ntb]\|0\d*\|x\x\+\)'

-" server options
-syn keyword fetchmailServerOpts	contained via proto[col] local[domains] port auth[enticate]
-syn keyword fetchmailServerOpts	contained timeout envelope qvirtual aka interface monitor
-syn keyword fetchmailServerOpts	contained plugin plugout dns checkalias uidl interval netsec
-syn keyword fetchmailServerOpts	contained principal esmtpname esmtppassword
-syn match   fetchmailServerOpts	contained "\<no\_s\+\(envelope\|dns\|checkalias\|uidl\)"
+syn region  fetchmailKeyword    transparent matchgroup=fetchmailKeyword
+                                \ start='\<poll\|skip\|defaults\>'
+                                \ end='\<poll\|skip\|defaults\>'
+                                \ contains=ALLBUT,fetchmailOptions,fetchmailSet

-" user options
-syn keyword fetchmailUserOpts	contained user[name] is to pass[word] ssl sslcert sslkey sslproto folder
-syn keyword fetchmailUserOpts	contained smtphost fetchdomains smtpaddress smtpname antispam mda bsmtp
-syn keyword fetchmailUserOpts	contained preconnect postconnect keep flush fetchall rewrite stripcr
-syn keyword fetchmailUserOpts	contained forcecr pass8bits dropstatus dropdelivered mimedecode idle
-syn keyword fetchmailUserOpts	contained 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 fetchmailServerOpts contained via proto[col] local[domains] port
+                                \ auth[enticate] timeout envelope qvirtual aka
+                                \ interface monitor plugin plugout dns
+                                \ checkalias uidl interval netsec principal
+                                \ esmtpname esmtppassword
+syn match   fetchmailServerOpts contained '\<no\_s\+\(envelope\|dns\|checkalias\|uidl\)'

-syn keyword fetchmailSpecial	contained here there
+syn keyword fetchmailUserOpts   contained user[name] is to pass[word] ssl
+                                \ sslcert sslkey sslproto folder smtphost
+                                \ fetchdomains smtpaddress smtpname antispam
+                                \ mda bsmtp preconnect postconnect keep flush
+                                \ fetchall rewrite stripcr forcecr pass8bits
+                                \ dropstatus dropdelivered mimedecode idle
+                                \ 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 keyword fetchmailNoise      and with has wants options
+syn match   fetchmailNoise      display '[:;,]'

-" options
-syn keyword fetchmailSet	nextgroup=fetchmailOptions skipwhite skipnl set
+syn keyword fetchmailSet        nextgroup=fetchmailOptions skipwhite skipnl set

-syn keyword fetchmailOptions	daemon postmaster bouncemail spambounce logfile idfile syslog nosyslog properties
-syn match   fetchmailOptions	"\<no\_s\+\(bouncemail\|spambounce\)"
+syn keyword fetchmailOptions    daemon postmaster bouncemail spambounce logfile
+                                \ idfile syslog nosyslog properties
+syn match   fetchmailOptions    '\<no\_s\+\(bouncemail\|spambounce\)'

-" 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_fetchmail_syn_inits")
-  if version < 508
-    let did_fetchmail_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  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
+hi def link fetchmailComment    Comment
+hi def link fetchmailTodo       Todo
+hi def link fetchmailNumber     Number
+hi def link fetchmailString     String
+hi def link fetchmailStringEsc  SpecialChar
+hi def link fetchmailKeyword    Keyword
+hi def link fetchmailServerOpts Identifier
+hi def link fetchmailUserOpts   Identifier
+hi def link fetchmailSpecial    Special
+hi def link fetchmailSet        Keyword
+hi def link fetchmailOptions    Identifier

 let b:current_syntax = "fetchmail"

-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bram Moolenaar	1f8a5f0eac	updated for version 7.0099	2005-07-01 22:41:52 +00:00
Bram Moolenaar	ba4128faa3	updated for version 7.0099	2005-07-01 22:38:32 +00:00
Bram Moolenaar	7887d88a9f	updated for version 7.0099	2005-07-01 22:33:52 +00:00
Bram Moolenaar	505e82870e	updated for version 7.0099	2005-07-01 22:31:55 +00:00
Bram Moolenaar	7fae636fc8	updated for version 7.0098	2005-06-30 22:06:41 +00:00
Bram Moolenaar	d042c56e34	updated for version 7.0098	2005-06-30 22:04:15 +00:00
Bram Moolenaar	e6b165e0f4	updated for version 7.0098	2005-06-30 21:56:01 +00:00
Bram Moolenaar	9c96f592af	updated for version 7.0098	2005-06-30 21:52:39 +00:00
Bram Moolenaar	42eeac3552	updated for version 7.0097	2005-06-29 22:40:58 +00:00
Bram Moolenaar	24bbcfe8fe	updated for version 7.0096	2005-06-28 23:32:02 +00:00
Bram Moolenaar	d7b31706f7	updated for version 7.0096	2005-06-28 23:24:33 +00:00
Bram Moolenaar	a1ba811ac9	updated for version 7.0096	2005-06-28 23:23:32 +00:00
Bram Moolenaar	9a50b1bf21	updated for version 7.0095	2005-06-27 22:48:21 +00:00
Bram Moolenaar	39a58ca3d4	updated for version 7.0095	2005-06-27 22:42:44 +00:00
Bram Moolenaar	d4098f5f19	updated for version 7.0095	2005-06-27 22:37:13 +00:00
Bram Moolenaar	702517dd70	updated for version 7.0095	2005-06-27 22:34:07 +00:00
Bram Moolenaar	b61d40504e	updated for version 7.0095	2005-06-27 22:29:54 +00:00
Bram Moolenaar	cf6bf39f68	updated for version 7.0095	2005-06-27 22:27:46 +00:00
Bram Moolenaar	238f4fa798	updated for version 7.0095	2005-06-27 22:25:50 +00:00
Bram Moolenaar	d9fba318b8	updated for version 7.0094	2005-06-26 22:34:35 +00:00
Bram Moolenaar	80b29f273d	updated for version 7.0094	2005-06-26 22:30:47 +00:00
Bram Moolenaar	1e498f5e5d	updated for version 7.0094	2005-06-26 22:29:44 +00:00
Bram Moolenaar	0017fc52cb	updated for version 7.0094	2005-06-26 22:28:42 +00:00
Bram Moolenaar	4eec5ec8ce	updated for version 7.0094	2005-06-26 22:26:21 +00:00