packages: vim-syntax-spec/spec.vim - match __with_without (and family) macr...

[sparky]

Author: sparky                       Date: Sun Feb  7 17:18:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- match __with_without (and family) macros
- mark command options inside inline bconds, e.g.: %{with_foo:--bar}

---- Files affected:
packages/vim-syntax-spec:
   spec.vim (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: packages/vim-syntax-spec/spec.vim
diff -u packages/vim-syntax-spec/spec.vim:1.98 packages/vim-syntax-spec/spec.vim:1.99
--- packages/vim-syntax-spec/spec.vim:1.98	Mon Nov 23 01:11:33 2009
+++ packages/vim-syntax-spec/spec.vim	Sun Feb  7 18:18:06 2010
@@ -29,11 +29,18 @@
 syn match specVariables   contained '\${\w*[#%][^}]*}' contains=specSubstChar
 
 syn match specMacroIdentifier contained '%\h\w*' contains=specMacroNameLocal,specMacroNameOther,specPercent,specSpecialChar
-syn region specMacroIdentifier oneline matchgroup=Special start='%{' skip='\\}' end='}' contains=specMacroNameLocal,specMacroNameOther,specPercent,specSpecialChar
+syn region specMacroIdentifier oneline matchgroup=Special start='%{' skip='\\}' end='}' contains=specConfOpts,specMacroNameLocal,specMacroNameOther,specPercent,specSpecialChar
 syn match specBcond contained '%{with\(out\)\?\s\+[a-zA-Z0-9_-]\+}'
 
+syn match specConfOpts contained '{\@<=__with\(_without\)\?' nextgroup=specConfOptsBcond
+syn match specConfOpts contained '{\@<=__without' nextgroup=specConfOptsBcond
+syn match specConfOpts contained '{\@<=__enable\(_disable\)\?' nextgroup=specConfOptsBcond
+syn match specConfOpts contained '{\@<=__disable' nextgroup=specConfOptsBcond
+syn match specConfOptsBcond '\s\+[a-zA-Z0-9_]\+' nextgroup=specConfOptsName
+syn match specConfOptsName '\s\+[a-zA-Z0-9_-]\+'
+
 syn match specSpecialVariables contained '\$[0-9]\|\${[0-9]}'
-syn match specCommandOpts      contained '\s\(-\w\+\|--\w[a-zA-Z0-9_-]\+\)'ms=s+1
+syn match specCommandOpts      contained '\(\s\|:\)\@<=\(-\w\+\|--\w[a-zA-Z0-9_-]\+\)'
 syn match specComment '^\s*#.*$'
 
 " matches with no highlight
@@ -276,6 +283,9 @@
   " spec colors
   HiLink specBlock			Function
   HiLink specBcond			Function
+  HiLink specConfOpts			specOpts
+  HiLink specConfOptsBcond		Function
+  HiLink specConfOptsName		specOpts
   HiLink specColon			Special
   HiLink specCommand			Statement
   HiLink specPreambleField		Statement
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim-syntax-spec/spec.vim?r1=1.98&r2=1.99&f=u