--- 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
-
-" Variables
-syn match   crmVariable    ':[*#@]:[^:]\{-1,}:'
+syn keyword crmTodo       contained TODO FIXME XXX NOTE
 
-" Special Characters
-syn match   crmSpecial	    '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'
+syn region  crmComment    matchgroup=crmComment start='#' end='$' end='\\#'
+                          \ contains=crmTodo,@Spell
 
-" 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   crmVariable   display ':[*#@]:[^:]\{-1,}:'
 
-" Regexes
-syn region   crmRegex	    matchgroup=crmRegex start='/' skip='\\/' end='/' contains=crmVariable
+syn match   crmSpecial    display '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'
 
-" Labels
-syn match   crmLabel	    '^\s*:[[:graph:]]\+:'
+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 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