Merge branch 'master' into 2011-09-09-CxScript

This commit is contained in:
Jason Turner
2012-05-21 12:10:15 -06:00

View File

@@ -7,6 +7,9 @@ if exists("b:current_syntax")
finish finish
end end
let s:cpo_save = &cpo
set cpo&vim
syn case match syn case match
" syncing method " syncing method
@@ -16,11 +19,11 @@ syn sync fromstart
syn region chaiscriptString start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=chaiscriptSpecial,chaiscriptEval,@Spell syn region chaiscriptString start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=chaiscriptSpecial,chaiscriptEval,@Spell
" Escape characters " Escape characters
syn match chaiscriptSpecial contained "\\[\\abfnrtv\'\"]\|\\\d\{,3}" syn match chaiscriptSpecial contained "\\[\\abfnrtv\'\"]\|\\\d\{,3}"
" String evals " String evals
syn region chaiscriptEval contained start="${" end="}" syn region chaiscriptEval contained start="${" end="}"
" integer number " integer number
syn match chaiscriptNumber "\<\d\+\>" syn match chaiscriptNumber "\<\d\+\>"
@@ -91,4 +94,6 @@ hi def link chaiscriptEval Special
let b:current_syntax = "chaiscript" let b:current_syntax = "chaiscript"
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: nowrap sw=2 sts=2 ts=8 noet " vim: nowrap sw=2 sts=2 ts=8 noet