updated for version 7.2-000
diff --git a/runtime/syntax/haml.vim b/runtime/syntax/haml.vim
index 8b22d8c..395600a 100644
--- a/runtime/syntax/haml.vim
+++ b/runtime/syntax/haml.vim
@@ -42,11 +42,15 @@
syn match hamlPlainChar "\\" contained
syn region hamlInterpolatable matchgroup=hamlInterpolatableChar start="==" end="$" keepend contained contains=hamlInterpolation
syn region hamlInterpolation matchgroup=hamlInterpolationDelimiter start="#{" end="}" contained contains=@hamlRubyTop
+syn region hamlErbInterpolation matchgroup=hamlInterpolationDelimiter start="<%[=-]\=" end="-\=%>" contained contains=@hamlRubyTop
syn match hamlHelper "\<action_view?\|\.\@<!\<\%(flatten\|open\|puts\)" contained containedin=@hamlEmbeddedRuby,@hamlRubyTop,rubyInterpolation
syn keyword hamlHelper capture_haml find_and_preserve html_attrs init_haml_helpers list_of preced preserve succeed surround tab_down tab_up page_class contained containedin=@hamlEmbeddedRuby,@hamlRubyTop,rubyInterpolation
-syn region hamlPlainFilter matchgroup=hamlFilter start="^\z(\s*\):\%(plain\|preserve\|erb\|redcloth\|textile\|markdown\)\s*$" end="^\%(\z1 \)\@!" contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlComment,@htmlTop
+syn cluster hamlHtmlTop contains=@htmlTop,htmlBold,htmlItalic,htmlUnderline
+syn region hamlPlainFilter matchgroup=hamlFilter start="^\z(\s*\):\%(plain\|preserve\|erb\|redcloth\|textile\|markdown\)\s*$" end="^\%(\z1 \)\@!" contains=@hamlHtmlTop,rubyInterpolation
+syn region hamlEscapedFilter matchgroup=hamlFilter start="^\z(\s*\):\%(escaped\)\s*$" end="^\%(\z1 \)\@!" contains=rubyInterpolation
+syn region hamlErbFilter matchgroup=hamlFilter start="^\z(\s*\):erb\s*$" end="^\%(\z1 \)\@!" contains=@hamlHtmlTop,hamlErbInterpolation
syn region hamlRubyFilter matchgroup=hamlFilter start="^\z(\s*\):ruby\s*$" end="^\%(\z1 \)\@!" contains=@hamlRubyTop
syn region hamlSassFilter matchgroup=hamlFilter start="^\z(\s*\):sass\s*$" end="^\%(\z1 \)\@!" contains=@hamlSassTop
diff --git a/runtime/syntax/promela.vim b/runtime/syntax/promela.vim
index 9c8a87c..e812bc2 100644
--- a/runtime/syntax/promela.vim
+++ b/runtime/syntax/promela.vim
@@ -1,9 +1,9 @@
" Vim syntax file
-" Language: ProMeLa
+" Language: ProMeLa
" Maintainer: Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com>
" First Release: Mon Oct 16 08:49:46 CEST 2006
-" Last Change: Sat May 16 12:20:43 CEST 2007
-" Version: 0.2
+" Last Change: Thu Aug 7 21:22:48 CEST 2008
+" Version: 0.5
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@ -19,17 +19,9 @@
syn keyword promelaStatement proctype if else while chan do od fi break goto unless
syn keyword promelaStatement active assert label atomic
syn keyword promelaFunctions skip timeout run
-" check what it is the following
+syn keyword promelaTodo contained TODO
" ProMeLa Types
syn keyword promelaType bit bool byte short int
-" ProMeLa Regions
-syn region promelaComment start="\/\/" end="$" keepend
-syn region promelaString start="\"" end="\""
-" syn region promelaComment start="//" end="$" contains=ALL
-" syn region promelaComment start="/\*" end="\*/" contains=ALL
-" ProMeLa Comment
-syn match promelaComment "\/.*$"
-syn match promelaComment "/\*.*\*/"
" Operators and special characters
syn match promelaOperator "!"
syn match promelaOperator "?"
@@ -47,14 +39,18 @@
syn match promelaSpecial "\]"
syn match promelaSpecial ";"
syn match promelaSpecial "::"
+" ProMeLa Comments
+syn region promelaComment start="/\*" end="\*/" contains=promelaTodo,@Spell
+syn match promelaComment "//.*" contains=promelaTodo,@Spell
" Class Linking
-hi def link promelaStatement Statement
-hi def link promelaType Type
-hi def link promelaComment Comment
-hi def link promelaOperator Type
-hi def link promelaSpecial Special
-hi def link promelaFunctions Special
+hi def link promelaStatement Statement
+hi def link promelaType Type
+hi def link promelaComment Comment
+hi def link promelaOperator Type
+hi def link promelaSpecial Special
+hi def link promelaFunctions Special
hi def link promelaString String
+hi def link promelaTodo Todo
let b:current_syntax = "promela"