diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-06-24 21:56:24 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-06-24 21:56:24 +0000 |
commit | 446cb837a017fc1c1b144cb5c2a35cb90abfbbcf (patch) | |
tree | 6c1fe56f2db8d4adbeee792b181b0659c4d1f216 /runtime/syntax | |
parent | 3577c6fafb77da5419cd1001dac56f204d480bdc (diff) |
updated for version 7.2a
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/2html.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/colortest.vim | 13 | ||||
-rw-r--r-- | runtime/syntax/def.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/dtrace.vim | 150 | ||||
-rw-r--r-- | runtime/syntax/erlang.vim | 355 | ||||
-rw-r--r-- | runtime/syntax/eruby.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/esterel.vim | 38 | ||||
-rw-r--r-- | runtime/syntax/fvwm.vim | 66 | ||||
-rw-r--r-- | runtime/syntax/indent.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/java.vim | 7 | ||||
-rw-r--r-- | runtime/syntax/man.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/mplayerconf.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/muttrc.vim | 201 | ||||
-rw-r--r-- | runtime/syntax/po.vim | 30 | ||||
-rw-r--r-- | runtime/syntax/readline.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/rhelp.vim | 5 | ||||
-rw-r--r-- | runtime/syntax/sqlanywhere.vim | 1199 | ||||
-rw-r--r-- | runtime/syntax/sudoers.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/tpp.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/verilogams.vim | 31 | ||||
-rw-r--r-- | runtime/syntax/xbl.vim | 29 | ||||
-rw-r--r-- | runtime/syntax/xpm.vim | 14 |
22 files changed, 1282 insertions, 896 deletions
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim index 8f443272f0..bd4016615e 100644 --- a/runtime/syntax/2html.vim +++ b/runtime/syntax/2html.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2007 Mar 10 +" Last Change: 2007 Aug 31 " (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>) " (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>) " (made w3 compliant by Edd Barrett <vext01@gmail.com>) @@ -162,9 +162,9 @@ else let s:html_encoding = 'iso-8859-1' elseif s:vim_encoding =~ "^cp12" let s:html_encoding = substitute(s:vim_encoding, 'cp', 'windows-', '') - elseif s:vim_encoding == 'sjis' + elseif s:vim_encoding == 'sjis' || s:vim_encoding == 'cp932' let s:html_encoding = 'Shift_JIS' - elseif s:vim_encoding == 'big5' + elseif s:vim_encoding == 'big5' || s:vim_encoding == 'cp950' let s:html_encoding = "Big5" elseif s:vim_encoding == 'euc-cn' let s:html_encoding = 'GB_2312-80' diff --git a/runtime/syntax/colortest.vim b/runtime/syntax/colortest.vim index 377eba98fe..58de7aaf13 100644 --- a/runtime/syntax/colortest.vim +++ b/runtime/syntax/colortest.vim @@ -1,7 +1,7 @@ " Vim script for testing colors " Maintainer: Bram Moolenaar <Bram@vim.org> " Contributors: Rafael Garcia-Suarez, Charles Campbell -" Last Change: 2006 Feb 20 +" Last Change: 2008 Jun 04 " edit this file, then do ":source %", and check if the colors match @@ -55,11 +55,18 @@ " Open this file in a window if it isn't edited yet. " Use the current window if it's empty. if expand('%:p') != expand('<sfile>:p') + let s:fname = expand('<sfile>') + if exists('*fnameescape') + let s:fname = fnameescape(s:fname) + else + let s:fname = escape(s:fname, ' \|') + endif if &mod || line('$') != 1 || getline(1) != '' - exe "new " . expand('<sfile>') + exe "new " . s:fname else - exe "edit " . expand('<sfile>') + exe "edit " . s:fname endif + unlet s:fname endif syn clear diff --git a/runtime/syntax/def.vim b/runtime/syntax/def.vim index a360022b2e..48518d7416 100644 --- a/runtime/syntax/def.vim +++ b/runtime/syntax/def.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Microsoft Module-Definition (.def) File -" Maintainer: Rob Brady <robb@datatone.com> +" Orig Author: Rob Brady <robb@datatone.com> +" Maintainer: Wu Yongwei <wuyongwei@gmail.com> " Last Change: $Date$ -" URL: http://www.datatone.com/~robb/vim/syntax/def.vim " $Revision$ " For version 5.x: Clear all syntax items @@ -23,7 +23,7 @@ syn keyword defKeyword HEAPSIZE DATA syn keyword defStorage LOADONCALL MOVEABLE DISCARDABLE SINGLE syn keyword defStorage FIXED PRELOAD -syn match defOrdinal "@\d\+" +syn match defOrdinal "\s\+@\d\+" syn region defString start=+'+ end=+'+ diff --git a/runtime/syntax/dtrace.vim b/runtime/syntax/dtrace.vim new file mode 100644 index 0000000000..2f2d6e2cc7 --- /dev/null +++ b/runtime/syntax/dtrace.vim @@ -0,0 +1,150 @@ +" DTrace D script syntax file. To avoid confusion with the D programming +" language, I call this script dtrace.vim instead of d.vim. +" Language: D script as described in "Solaris Dynamic Tracing Guide", +" http://docs.sun.com/app/docs/doc/817-6223 +" Version: 1.5 +" Last Change: 2008/04/05 +" Maintainer: Nicolas Weber <nicolasweber@gmx.de> + +" dtrace lexer and parser are at +" http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libdtrace/common/dt_lex.l +" http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libdtrace/common/dt_grammar.y + +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +" Read the C syntax to start with +if version < 600 + so <sfile>:p:h/c.vim +else + runtime! syntax/c.vim + unlet b:current_syntax +endif + +syn clear cCommentL " dtrace doesn't support // style comments + +" First line may start with #!, also make sure a '-s' flag is somewhere in +" that line. +syn match dtraceComment "\%^#!.*-s.*" + +" Probe descriptors need explicit matches, so that keywords in probe +" descriptors don't show up as errors. Note that this regex detects probes +" as "something with three ':' in it". This works in practice, but it's not +" really correct. Also add special case code for BEGIN, END and ERROR, since +" they are common. +" Be careful not to detect '/*some:::node*/\n/**/' as probe, as it's +" commented out. +" XXX: This allows a probe description to end with ',', even if it's not +" followed by another probe. +" XXX: This doesn't work if followed by a comment. +let s:oneProbe = '\%(BEGIN\|END\|ERROR\|\S\{-}:\S\{-}:\S\{-}:\S\{-}\)\_s*' +exec 'syn match dtraceProbe "'.s:oneProbe.'\%(,\_s*'.s:oneProbe.'\)*\ze\_s\%({\|\/[^*]\|\%$\)"' + +" Note: We have to be careful to not make this match /* */ comments. +" Also be careful not to eat `c = a / b; b = a / 2;`. We use the same +" technique as the dtrace lexer: a predicate has to be followed by {, ;, or +" EOF. Also note that dtrace doesn't allow an empty predicate // (we do). +" This regex doesn't allow a divison operator in the predicate. +" Make sure that this matches the empty predicate as well. +" XXX: This doesn't work if followed by a comment. +syn match dtracePredicate "/\*\@!\_[^/]*/\ze\_s*\%({\|;\|\%$\)" + "contains=ALLBUT,dtraceOption " this lets the region contain too much stuff + +" Pragmas. +" dtrace seems not to support whitespace before or after the '='. dtrace +" supports only one option per #pragma, and no continuations of #pragma over +" several lines with '\'. +" Note that dtrace treats units (Hz etc) as case-insenstive, we allow only +" sane unit capitalization in this script (ie 'ns', 'us', 'ms', 's' have to be +" small, Hertz can be 'Hz' or 'hz') +" XXX: "cpu" is always highlighted as builtin var, not as option + +" auto or manual: bufresize +syn match dtraceOption contained "bufresize=\%(auto\|manual\)\s*$" + +" scalar: cpu jstackframes jstackstrsize nspec stackframes stackindent ustackframes +syn match dtraceOption contained "\%(cpu\|jstackframes\|jstackstrsize\|nspec\|stackframes\|stackindent\|ustackframes\)=\d\+\s*$" + +" size: aggsize bufsize dynvarsize specsize strsize +" size defaults to something if no unit is given (ie., having no unit is ok) +syn match dtraceOption contained "\%(aggsize\|bufsize\|dynvarsize\|specsize\|strsize\)=\d\+\%(k\|m\|g\|t\|K\|M\|G\|T\)\=\s*$" + +" time: aggrate cleanrate statusrate switchrate +" time defaults to hz if no unit is given +syn match dtraceOption contained "\%(aggrate\|cleanrate\|statusrate\|switchrate\)=\d\+\%(hz\|Hz\|ns\|us\|ms\|s\)\=\s*$" + +" No type: defaultargs destructive flowindent grabanon quiet rawbytes +syn match dtraceOption contained "\%(defaultargs\|destructive\|flowindent\|grabanon\|quiet\|rawbytes\)\s*$" + + +" Turn reserved but unspecified keywords into errors +syn keyword dtraceReservedKeyword auto break case continue counter default do +syn keyword dtraceReservedKeyword else for goto if import probe provider +syn keyword dtraceReservedKeyword register restrict return static switch while + +" Add dtrace-specific stuff +syn keyword dtraceOperator sizeof offsetof stringof xlate +syn keyword dtraceStatement self inline xlate this translator + +" Builtin variables +syn keyword dtraceIdentifier arg0 arg1 arg2 arg3 arg4 arg5 arg6 arg7 arg8 arg9 +syn keyword dtraceIdentifier args caller chip cpu curcpu curlwpsinfo curpsinfo +syn keyword dtraceIdentifier curthread cwd epid errno execname gid id ipl lgrp +syn keyword dtraceIdentifier pid ppid probefunc probemod probename probeprov +syn keyword dtraceIdentifier pset root stackdepth tid timestamp uid uregs +syn keyword dtraceIdentifier vtimestamp walltimestamp +syn keyword dtraceIdentifier ustackdepth + +" Macro Variables +syn match dtraceConstant "$[0-9]\+" +syn match dtraceConstant "$\(egid\|euid\|gid\|pgid\|ppid\)" +syn match dtraceConstant "$\(projid\|sid\|target\|taskid\|uid\)" + +" Data Recording Actions +syn keyword dtraceFunction trace tracemem printf printa stack ustack jstack + +" Process Destructive Actions +syn keyword dtraceFunction stop raise copyout copyoutstr system + +" Kernel Destructive Actions +syn keyword dtraceFunction breakpoint panic chill + +" Special Actions +syn keyword dtraceFunction speculate commit discard exit + +" Subroutines +syn keyword dtraceFunction alloca basename bcopy cleanpath copyin copyinstr +syn keyword dtraceFunction copyinto dirname msgdsize msgsize mutex_owned +syn keyword dtraceFunction mutex_owner mutex_type_adaptive progenyof +syn keyword dtraceFunction rand rw_iswriter rw_write_held speculation +syn keyword dtraceFunction strjoin strlen + +" Aggregating Functions +syn keyword dtraceAggregatingFunction count sum avg min max lquantize quantize + +syn keyword dtraceType int8_t int16_t int32_t int64_t intptr_t +syn keyword dtraceType uint8_t uint16_t uint32_t uint64_t uintptr_t +syn keyword dtraceType string +syn keyword dtraceType pid_t id_t + + +" Define the default highlighting. +" We use `hi def link` directly, this requires 5.8. +hi def link dtraceReservedKeyword Error +hi def link dtracePredicate String +hi def link dtraceProbe dtraceStatement +hi def link dtraceStatement Statement +hi def link dtraceConstant Constant +hi def link dtraceIdentifier Identifier +hi def link dtraceAggregatingFunction dtraceFunction +hi def link dtraceFunction Function +hi def link dtraceType Type +hi def link dtraceOperator Operator +hi def link dtraceComment Comment +hi def link dtraceNumber Number +hi def link dtraceOption Identifier + +let b:current_syntax = "dtrace" diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim index a8ffb3939f..e3d68363d5 100644 --- a/runtime/syntax/erlang.vim +++ b/runtime/syntax/erlang.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: erlang (ERicsson LANGuage) -" http://www.erlang.se -" http://www.erlang.org -" Maintainer: Kre¹imir Mar¾iæ (Kresimir Marzic) <kmarzic@fly.srk.fer.hr> -" Last update: Fri, 15-Feb-2002 +" http://www.erlang.se +" http://www.erlang.org +" Maintainer: Csaba Hoch <csaba.hoch@gmail.com> +" Former Maintainer: KreÄ…imir Marľić (Kresimir Marzic) <kmarzic@fly.srk.fer.hr> +" Last update: 12-Mar-2008 " Filenames: .erl -" URL: http://www.srk.fer.hr/~kmarzic/vim/syntax/erlang.vim " There are three sets of highlighting in here: @@ -24,9 +24,9 @@ " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded if version < 600 - syntax clear + syntax clear elseif exists ("b:current_syntax") - finish + finish endif @@ -35,136 +35,140 @@ syn case match if ! exists ("erlang_characters") - " Basic elements - syn match erlangComment +%.*$+ - syn match erlangModifier "\~\a\|\\\a" contained - syn match erlangSpecialCharacter ":\|_\|@\|\\\|\"\|\." - syn match erlangSeparator "(\|)\|{\|}\|\[\|]\||\|||\|;\|,\|?\|->\|#" contained - syn region erlangString start=+"+ skip=+\\"+ end=+"+ contains=erlangModifier - syn region erlangAtom start=+'+ skip=+\\'+ end=+'+ - - " Operators - syn match erlangOperator "+\|-\|\*\|\/" - syn keyword erlangOperator div rem or xor bor bxor bsl bsr - syn keyword erlangOperator and band not bnot - syn match erlangOperator "==\|/=\|=:=\|=/=\|<\|=<\|>\|>=" - syn match erlangOperator "++\|--\|=\|!\|<-" - - " Numbers - syn match erlangNumberInteger "[+-]\=\d\+" contains=erlangSeparator - syn match erlangNumberFloat1 "[+-]\=\d\+.\d\+" contains=erlangSeparator - syn match erlangNumberFloat2 "[+-]\=\d\+\(.\d\+\)\=[eE][+-]\=\d\+\(.\d\+\)\=" contains=erlangSeparator - syn match erlangNumberFloat3 "[+-]\=\d\+[#]\x\+" contains=erlangSeparator - syn match erlangNumberFloat4 "[+-]\=[eE][+-]\=\d\+" contains=erlangSeparator - syn match erlangNumberHex "$\x\+" contains=erlangSeparator - - " Ignore '_' and '-' in words - syn match erlangWord "\w\+[_-]\+\w\+" - - " Ignore numbers in words - syn match erlangWord "\w\+\d\+\(\(.\d\+\)\=\(\w\+\)\=\)\=" + + " Basic elements + syn match erlangComment "%.*$" contains=erlangAnnotation,erlangTodo + syn match erlangAnnotation " \@<=@\%(clear\|docfile\|end\|headerfile\|todo\|TODO\|type\|author\|copyright\|doc\|reference\|see\|since\|title\|version\|deprecated\|hidden\|private\|equiv\|spec\|throws\)" contained + syn match erlangAnnotation "`[^']*'" contained + syn keyword erlangTodo TODO FIXME XXX contained + syn match erlangModifier "\~\a\|\\\a\|\\\\" contained + syn match erlangSpecialCharacter ":\|_\|@\|\\\|\"\|\." + syn match erlangSeparator "(\|)\|{\|}\|\[\|]\||\|||\|;\|,\|?\|->\|#" contained + syn region erlangString start=+"+ skip=+\\.+ end=+"+ contains=erlangModifier + syn region erlangAtom start=+'+ skip=+\\'+ end=+'+ + + " Operators + syn match erlangOperator "+\|-\|\*\|\/" + syn keyword erlangOperator div rem or xor bor bxor bsl bsr + syn keyword erlangOperator and band not bnot + syn match erlangOperator "==\|/=\|=:=\|=/=\|<\|=<\|>\|>=" + syn match erlangOperator "++\|--\|=\|!\|<-" + + " Numbers + syn match erlangNumberInteger "\d\+" contains=erlangSeparator + syn match erlangNumberFloat1 "\d\+\.\d\+" contains=erlangSeparator + syn match erlangNumberFloat2 "\d\+\(\.\d\+\)\=[eE][+-]\=\d\+\(\.\d\+\)\=" contains=erlangSeparator + syn match erlangNumberFloat3 "\d\+[#]\x\+" contains=erlangSeparator + syn match erlangNumberHex "$\x\+" contains=erlangSeparator + + " Ignore '_' and '-' in words + syn match erlangWord "\h\+\w*" + + syn match erlangChar /\$./ endif if ! exists ("erlang_functions") - " Functions call - syn match erlangFCall "\w\+\(\s\+\)\=[:@]\(\s\+\)\=\w\+" contains=ALLBUT,erlangFunction,erlangBIF,erlangWord - - " build-in-functions (BIFs) - syn keyword erlangBIF abs alive apply atom_to_list - syn keyword erlangBIF binary_to_list binary_to_term - syn keyword erlangBIF concat_binary - syn keyword erlangBIF date disconnect_node - syn keyword erlangBIF element erase exit - syn keyword erlangBIF float float_to_list - syn keyword erlangBIF get get_keys group_leader - syn keyword erlangBIF halt hd - syn keyword erlangBIF integer_to_list is_alive - syn keyword erlangBIF length link list_to_atom list_to_binary - syn keyword erlangBIF list_to_float list_to_integer list_to_pid - syn keyword erlangBIF list_to_tuple load_module - syn keyword erlangBIF make_ref monitor_node - syn keyword erlangBIF node nodes now - syn keyword erlangBIF open_port - syn keyword erlangBIF pid_to_list process_flag - syn keyword erlangBIF process_info process put - syn keyword erlangBIF register registered round - syn keyword erlangBIF self setelement size spawn - syn keyword erlangBIF spawn_link split_binary statistics - syn keyword erlangBIF term_to_binary throw time tl trunc - syn keyword erlangBIF tuple_to_list - syn keyword erlangBIF unlink unregister - syn keyword erlangBIF whereis - - " Other BIFs - syn keyword erlangBIF atom binary constant function integer - syn keyword erlangBIF list number pid ports port_close port_info - syn keyword erlangBIF reference record - - " erlang:BIFs - syn keyword erlangBIF check_process_code delete_module - syn keyword erlangBIF get_cookie hash math module_loaded - syn keyword erlangBIF preloaded processes purge_module set_cookie - syn keyword erlangBIF set_node - - " functions of math library - syn keyword erlangFunction acos asin atan atan2 cos cosh exp - syn keyword erlangFunction log log10 pi pow power sin sinh sqrt - syn keyword erlangFunction tan tanh - - " Other functions - syn keyword erlangFunction call module_info parse_transform - syn keyword erlangFunction undefined_function - - " Modules - syn keyword erlangModule error_handler + " Functions call + syn match erlangFCall "\%(\w\+\s*\.\s*\)*\w\+\s*[:@]\s*\w\+" + + " build-in-functions (BIFs) + syn keyword erlangBIF abs alive apply atom_to_list + syn keyword erlangBIF binary_to_list binary_to_term + syn keyword erlangBIF concat_binary + syn keyword erlangBIF date disconnect_node + syn keyword erlangBIF element erase exit + syn keyword erlangBIF float float_to_list + syn keyword erlangBIF get get_keys group_leader + syn keyword erlangBIF halt hd + syn keyword erlangBIF integer_to_list is_alive + syn keyword erlangBIF length link list_to_atom list_to_binary + syn keyword erlangBIF list_to_float list_to_integer list_to_pid + syn keyword erlangBIF list_to_tuple load_module + syn keyword erlangBIF make_ref monitor_node + syn keyword erlangBIF node nodes now + syn keyword erlangBIF open_port + syn keyword erlangBIF pid_to_list process_flag + syn keyword erlangBIF process_info process put + syn keyword erlangBIF register registered round + syn keyword erlangBIF self setelement size spawn + syn keyword erlangBIF spawn_link split_binary statistics + syn keyword erlangBIF term_to_binary throw time tl trunc + syn keyword erlangBIF tuple_to_list + syn keyword erlangBIF unlink unregister + syn keyword erlangBIF whereis + + " Other BIFs + syn keyword erlangBIF atom binary constant function integer + syn keyword erlangBIF list number pid ports port_close port_info + syn keyword erlangBIF reference record + + " erlang:BIFs + syn keyword erlangBIF check_process_code delete_module + syn keyword erlangBIF get_cookie hash math module_loaded + syn keyword erlangBIF preloaded processes purge_module set_cookie + syn keyword erlangBIF set_node + + " functions of math library + syn keyword erlangFunction acos asin atan atan2 cos cosh exp + syn keyword erlangFunction log log10 pi pow power sin sinh sqrt + syn keyword erlangFunction tan tanh + + " Other functions + syn keyword erlangFunction call module_info parse_transform + syn keyword erlangFunction undefined_function + + " Modules + syn keyword erlangModule error_handler endif if ! exists ("erlang_keywords") - " Constants and Directives - syn match erlangDirective "-compile\|-define\|-else\|-endif\|-export\|-file" - syn match erlangDirective "-ifdef\|-ifndef\|-import\|-include\|-include_lib" - syn match erlangDirective "-module\|-record\|-undef" - - syn match erlangConstant "-author\|-copyright\|-doc" - - " Keywords - syn keyword erlangKeyword after begin case catch - syn keyword erlangKeyword cond end fun if - syn keyword erlangKeyword let of query receive - syn keyword erlangKeyword when - - " Processes - syn keyword erlangProcess creation current_function dictionary - syn keyword erlangProcess group_leader heap_size high initial_call - syn keyword erlangProcess linked low memory_in_use message_queue - syn keyword erlangProcess net_kernel node normal priority - syn keyword erlangProcess reductions registered_name runnable - syn keyword erlangProcess running stack_trace status timer - syn keyword erlangProcess trap_exit waiting - - " Ports - syn keyword erlangPort command count_in count_out creation in - syn keyword erlangPort in_format linked node out owner packeting - - " Nodes - syn keyword erlangNode atom_tables communicating creation - syn keyword erlangNode current_gc current_reductions current_runtime - syn keyword erlangNode current_wall_clock distribution_port - syn keyword erlangNode entry_points error_handler friends - syn keyword erlangNode garbage_collection magic_cookie magic_cookies - syn keyword erlangNode module_table monitored_nodes name next_ref - syn keyword erlangNode ports preloaded processes reductions - syn keyword erlangNode ref_state registry runtime wall_clock - - " Reserved - syn keyword erlangReserved apply_lambda module_info module_lambdas - syn keyword erlangReserved record record_index record_info - - " Extras - syn keyword erlangExtra badarg nocookie false fun true - - " Signals - syn keyword erlangSignal badsig kill killed exit normal + " Constants and Directives + syn match erlangDirective "-behaviour\|-behaviour" + syn match erlangDirective "-compile\|-define\|-else\|-endif\|-export\|-file" + syn match erlangDirective "-ifdef\|-ifndef\|-import\|-include_lib\|-include" + syn match erlangDirective "-module\|-record\|-undef" + + syn match erlangConstant "-author\|-copyright\|-doc\|-vsn" + + " Keywords + syn keyword erlangKeyword after begin case catch + syn keyword erlangKeyword cond end fun if + syn keyword erlangKeyword let of query receive + syn keyword erlangKeyword when + syn keyword erlangKeyword try + + " Processes + syn keyword erlangProcess creation current_function dictionary + syn keyword erlangProcess group_leader heap_size high initial_call + syn keyword erlangProcess linked low memory_in_use message_queue + syn keyword erlangProcess net_kernel node normal priority + syn keyword erlangProcess reductions registered_name runnable + syn keyword erlangProcess running stack_trace status timer + syn keyword erlangProcess trap_exit waiting + + " Ports + syn keyword erlangPort command count_in count_out creation in + syn keyword erlangPort in_format linked node out owner packeting + + " Nodes + syn keyword erlangNode atom_tables communicating creation + syn keyword erlangNode current_gc current_reductions current_runtime + syn keyword erlangNode current_wall_clock distribution_port + syn keyword erlangNode entry_points error_handler friends + syn keyword erlangNode garbage_collection magic_cookie magic_cookies + syn keyword erlangNode module_table monitored_nodes name next_ref + syn keyword erlangNode ports preloaded processes reductions + syn keyword erlangNode ref_state registry runtime wall_clock + + " Reserved + syn keyword erlangReserved apply_lambda module_info module_lambdas + syn keyword erlangReserved record record_index record_info + + " Extras + syn keyword erlangExtra badarg nocookie false fun true + + " Signals + syn keyword erlangSignal badsig kill killed exit normal endif @@ -173,52 +177,53 @@ endif " 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_erlang_inits") - if version < 508 - let did_erlang_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - " erlang_characters - HiLink erlangComment Comment - HiLink erlangSpecialCharacter Special - HiLink erlangSeparator Normal - HiLink erlangModifier Special - HiLink erlangOperator Operator - HiLink erlangString String - HiLink erlangAtom Type - - HiLink erlangNumberInteger Number - HiLink erlangNumberFloat1 Float - HiLink erlangNumberFloat2 Float - HiLink erlangNumberFloat3 Float - HiLink erlangNumberFloat4 Float - HiLink erlangNumberHex Number - - HiLink erlangWord Normal - - " erlang_functions - HiLink erlangFCall Function - HiLink erlangBIF Function - HiLink erlangFunction Function - HiLink erlangModuleFunction Function - - " erlang_keywords - HiLink erlangDirective Type - HiLink erlangConstant Type - HiLink erlangKeyword Keyword - HiLink erlangProcess Special - HiLink erlangPort Special - HiLink erlangNode Special - HiLink erlangReserved Statement - HiLink erlangExtra Statement - HiLink erlangSignal Statement - - delcommand HiLink + if version < 508 + let did_erlang_inits = 1 + command -nargs=+ HiLink hi link <args> + else + command -nargs=+ HiLink hi def link <args> + endif + + " erlang_characters + HiLink erlangComment Comment + HiLink erlangAnnotation Special + HiLink erlangTodo Todo + HiLink erlangSpecialCharacter Special + HiLink erlangSeparator Normal + HiLink erlangModifier Special + HiLink erlangOperator Operator + HiLink erlangString String + HiLink erlangAtom Type + + HiLink erlangNumberInteger Number + HiLink erlangNumberFloat1 Float + HiLink erlangNumberFloat2 Float + HiLink erlangNumberFloat3 Float + HiLink erlangNumberFloat4 Float + HiLink erlangNumberHex Number + + HiLink erlangWord Normal + + " erlang_functions + HiLink erlangFCall Function + HiLink erlangBIF Function + HiLink erlangFunction Function + HiLink erlangModuleFunction Function + + " erlang_keywords + HiLink erlangDirective Type + HiLink erlangConstant Type + HiLink erlangKeyword Keyword + HiLink erlangProcess Special + HiLink erlangPort Special + HiLink erlangNode Special + HiLink erlangReserved Statement + HiLink erlangExtra Statement + HiLink erlangSignal Statement + + delcommand HiLink endif let b:current_syntax = "erlang" -" eof diff --git a/runtime/syntax/eruby.vim b/runtime/syntax/eruby.vim index f85e0093d3..22a84537c8 100644 --- a/runtime/syntax/eruby.vim +++ b/runtime/syntax/eruby.vim @@ -82,4 +82,4 @@ if main_syntax == 'eruby' unlet main_syntax endif -" vim: nowrap sw=2 sts=2 ts=8 ff=unix: +" vim: nowrap sw=2 sts=2 ts=8 : diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim index cc3c4d7305..d853e75208 100644 --- a/runtime/syntax/esterel.vim +++ b/runtime/syntax/esterel.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: ESTEREL " Maintainer: Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com> -" Credits: Luca Necchi <luca.necchi@polito.it> +" Credits: Luca Necchi <luca.necchi@polito.it>, Nikos Andrikos <nick.andrik@gmail.com> " First Release: Tue May 17 23:49:39 CEST 2005 -" Last Change: Sat Apr 22 14:56:41 CEST 2006 -" Version: 0.5 +" Last Change: Tue May 6 13:29:56 CEST 2008 +" Version: 0.8 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -28,7 +28,7 @@ syn region esterelIfThen start=/if/ end=/then/ oneline " Esterel Keywords syn keyword esterelIO input output inputoutput constant syn keyword esterelBoolean and or not xor xnor nor nand -syn keyword esterelExpressions mod +syn keyword esterelExpressions mod pre syn keyword esterelStatement nothing halt syn keyword esterelStatement module signal sensor end syn keyword esterelStatement every do loop abort weak @@ -43,20 +43,26 @@ syn keyword esterelStatement relation syn keyword esterelFunctions function procedure task syn keyword esterelSysCall call trap exit exec " Esterel Types -syn keyword esterelType integer float bolean +syn keyword esterelType integer float bolean " Esterel Comment -syn match esterelComment "%.*$" +syn match esterelComment "%.*$" " Operators and special characters -syn match esterelSpecial ":" -syn match esterelSpecial "<=" -syn match esterelSpecial ">=" -syn match esterelSpecial ";" -syn match esterelOperator "\[" -syn match esterelOperator "\]" -syn match esterelOperator ":=" -syn match esterelStatement "\<\(if\|else\)\>" -syn match esterelNone "\<else\s\+if\>$" -syn match esterelNone "\<else\s\+if\>\s" +syn match esterelSpecial ":" +syn match esterelSpecial "<=" +syn match esterelSpecial ">=" +syn match esterelSpecial "+" +syn match esterelSpecial "-" +syn match esterelSpecial "=" +syn match esterelSpecial ";" +syn match esterelSpecial "/" +syn match esterelSpecial "?" +syn match esterelOperator "\[" +syn match esterelOperator "\]" +syn match esterelOperator ":=" +syn match esterelOperator "||" +syn match esterelStatement "\<\(if\|else\)\>" +syn match esterelNone "\<else\s\+if\>$" +syn match esterelNone "\<else\s\+if\>\s" " Class Linking if version >= 508 || !exists("did_esterel_syntax_inits") diff --git a/runtime/syntax/fvwm.vim b/runtime/syntax/fvwm.vim index 43b7abcfc5..29112fcc7e 100644 --- a/runtime/syntax/fvwm.vim +++ b/runtime/syntax/fvwm.vim @@ -1,8 +1,8 @@ -" Vim syntax file +" Vim syntax file for Fvwm-2.5.22 " Language: Fvwm{1,2} configuration file " Maintainer: Gautam Iyer <gi1242@users.sourceforge.net> " Previous Maintainer: Haakon Riiser <hakonrk@fys.uio.no> -" Last Change: Sat 04 Nov 2006 11:28:37 PM PST +" Last Change: Sat 29 Sep 2007 11:08:34 AM PDT " " Thanks to David Necas (Yeti) for adding Fvwm 2.4 support. " @@ -43,7 +43,9 @@ syn match fvwmRGBValue "#\x\{9}" syn match fvwmRGBValue "#\x\{12}" syn match fvwmRGBValue "rgb:\x\{1,4}/\x\{1,4}/\x\{1,4}" -syn region fvwmComment contains=@Spell start="^\s*#" skip='\\$' end='$' +syn region fvwmComment contains=@Spell + \ start='^\s*#\s' skip='\\$' end='$' +syn region fvwmComment start="\v^\s*#(\S|$)" skip='\\$' end='$' if (exists("b:fvwm_version") && b:fvwm_version == 1) \ || (exists("use_fvwm_1") && use_fvwm_1) @@ -130,12 +132,16 @@ else syn match fvwmShortcutKey contained "&." syn keyword fvwmModuleName FvwmAnimate FvwmAudio FvwmAuto FvwmBacker - \ FvwmBanner FvwmButtons FvwmCommandS - \ FvwmConsole FvwmCpp FvwmDebug FvwmDragWell - \ FvwmEvent FvwmForm FvwmGtk FvwmIconBox + \ FvwmBanner FvwmButtons FvwmCascade + \ FvwmCommandS FvwmConsole FvwmConsoleC + \ FvwmCpp FvwmDebug FvwmDragWell FvwmEvent + \ FvwmForm FvwmGtkDebug FvwmIconBox \ FvwmIconMan FvwmIdent FvwmM4 FvwmPager - \ FvwmSave FvwmSaveDesk FvwmScript FvwmScroll - \ FvwmTaskBar FvwmWinList FvwmWharf + \ FvwmPerl FvwmProxy FvwmRearrange FvwmSave + \ FvwmSaveDesk FvwmScript FvwmScroll FvwmTabs + \ FvwmTalk FvwmTaskBar FvwmTheme FvwmTile + \ FvwmWharf FvwmWindowMenu FvwmWinList + " Obsolete fvwmModuleName: FvwmTheme syn keyword fvwmKeyword AddToMenu ChangeMenuStyle CopyMenuStyle @@ -162,21 +168,22 @@ else \ WindowShadeAnimate IgnoreModifiers \ EdgeCommand EdgeLeaveCommand GnomeButton \ Stroke StrokeFunc FocusStyle DestroyStyle - \ UpdateStyles AddToDecor BorderStyle - \ ChangeDecor DestroyDecor UpdateDecor - \ DesktopName DeskTopSize EdgeResistance - \ EdgeScroll EdgeThickness EwmhBaseStruts - \ EWMHNumberOfDesktops GotoDeskAndPage - \ GotoPage Scroll Xinerama + \ DestroyWindowStyle UpdateStyles AddToDecor + \ BorderStyle ChangeDecor DestroyDecor + \ UpdateDecor DesktopName DeskTopSize + \ EdgeResistance EdgeScroll EdgeThickness + \ EwmhBaseStruts EWMHNumberOfDesktops + \ GotoDeskAndPage GotoPage Scroll Xinerama \ XineramaPrimaryScreen XineramaSls \ XineramaSlsSize XineramaSlsScreens AddToFunc \ Beep DestroyFunc Echo Exec ExecUseShell \ Function Nop PipeRead Read SetEnv Silent \ UnsetEnv Wait DestroyModuleConfig KillModule - \ Module ModuleSynchronous ModuleTimeout |