diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-02-22 17:30:19 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-02-22 17:30:19 +0100 |
commit | db7207e6e51cf6677545e2f8e0aca427b3cf1956 (patch) | |
tree | 956dc0adb1d250813b9747027162703012bc4639 /runtime/syntax | |
parent | 84a4c334e1b840d666d0a178b9e665b6041c6b78 (diff) | |
download | vim-git-db7207e6e51cf6677545e2f8e0aca427b3cf1956.tar.gz |
Updated runtime files.
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/fasm.vim | 13 | ||||
-rw-r--r-- | runtime/syntax/resolv.vim | 11 | ||||
-rw-r--r-- | runtime/syntax/reva.vim | 45 | ||||
-rw-r--r-- | runtime/syntax/sshconfig.vim | 7 |
4 files changed, 44 insertions, 32 deletions
diff --git a/runtime/syntax/fasm.vim b/runtime/syntax/fasm.vim index 01bdc8311..696e05b4c 100644 --- a/runtime/syntax/fasm.vim +++ b/runtime/syntax/fasm.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: Flat Assembler (FASM) " Maintainer: Ron Aaron <ron@ronware.org> -" Last Change: 2004 May 16 +" Last Change: 2012/02/13 " Vim URL: http://www.vim.org/lang.html " FASM Home: http://flatassembler.net/ -" FASM Version: 1.52 +" FASM Version: 1.56 if version < 600 syntax clear @@ -12,6 +12,9 @@ elseif exists("b:current_syntax") finish endif +let s:cpo_save = &cpo +set cpo&vim + setlocal iskeyword=a-z,A-Z,48-57,.,_ setlocal isident=a-z,A-Z,48-57,.,_ syn case ignore @@ -97,7 +100,7 @@ syn keyword fasmDirective align binary code coff console discardable display dl syn keyword fasmDirective elf entry executable export extern far fixups format gui syn keyword fasmDirective import label ms mz native near notpageable pe public readable syn keyword fasmDirective repeat resource section segment shareable stack times -syn keyword fasmDirective use16 use32 virtual wdm writeable +syn keyword fasmDirective use16 use32 virtual wdm writable writeable syn keyword fasmOperator as at defined eq eqtype from mod on ptr rva used syn match fasmNumericOperator "[+-/*]" @@ -142,4 +145,8 @@ hi def link fasmInstr keyword hi def link fasmLabel label hi def link fasmPrefix preproc let b:current_syntax = "fasm" + +let &cpo = s:cpo_save +unlet s:cpo_save + " vim: ts=8 sw=8 : diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim index 6ec42d27d..1c0f8467d 100644 --- a/runtime/syntax/resolv.vim +++ b/runtime/syntax/resolv.vim @@ -1,11 +1,10 @@ " Vim syntax file " Language: resolver configuration file -" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz> +" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz> " Original Maintaner: Radu Dineiu <littledragon@altern.org> " License: This file can be redistribued and/or modified under the same terms " as Vim itself. -" URL: http://trific.ath.cx/Ftp/vim/syntax/resolv.vim -" Last Change: 2006-04-16 +" Last Change: 2012-02-21 if version < 600 syntax clear @@ -26,7 +25,8 @@ syn match resolvIPSpecial /\%(127\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)/ contained " General syn match resolvIP contained /\%(\d\{1,4}\.\)\{3}\d\{1,4}/ contains=@resolvIPCluster syn match resolvIPNetmask contained /\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?/ contains=resolvOperator,@resolvIPCluster -syn match resolvHostname contained /\w\{-}\.[-0-9A-Za-z_\.]*/ +syn match resolvHostname contained /\w\{-}\.[-0-9A-Za-z_.]*/ +syn match resolvDomainname contained /[-0-9A-Za-z_.]\+/ " Particular syn match resolvIPNameserver contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\s\|$\)\)\+/ contains=@resolvIPCluster @@ -36,7 +36,7 @@ syn match resolvIPNetmaskSortList contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/ " Identifiers syn match resolvNameserver /^\s*nameserver\>/ nextgroup=resolvIPNameserver skipwhite syn match resolvLwserver /^\s*lwserver\>/ nextgroup=resolvIPNameserver skipwhite -syn match resolvDomain /^\s*domain\>/ nextgroup=resolvHostname skipwhite +syn match resolvDomain /^\s*domain\>/ nextgroup=resolvDomainname skipwhite syn match resolvSearch /^\s*search\>/ nextgroup=resolvHostnameSearch skipwhite syn match resolvSortList /^\s*sortlist\>/ nextgroup=resolvIPNetmaskSortList skipwhite syn match resolvOptions /^\s*options\>/ nextgroup=resolvOption skipwhite @@ -61,6 +61,7 @@ if version >= 508 || !exists("did_config_syntax_inits") HiLink resolvIP Number HiLink resolvIPNetmask Number HiLink resolvHostname String + HiLink resolvDomainname String HiLink resolvOption String HiLink resolvIPNameserver Number diff --git a/runtime/syntax/reva.vim b/runtime/syntax/reva.vim index 7e11ffe2d..03dfc9d4c 100644 --- a/runtime/syntax/reva.vim +++ b/runtime/syntax/reva.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: Reva Forth -" Version: 7.1 -" Last Change: 2008/01/11 +" Version: 2011.2 +" Last Change: 2012/02/13 " Maintainer: Ron Aaron <ron@ronware.org> " URL: http://ronware.org/reva/ -" Filetypes: *.rf *.frt +" Filetypes: *.rf *.frt " NOTE: You should also have the ftplugin/reva.vim file to set 'isk' " For version 5.x: Clear all syntax items and don't load @@ -17,10 +17,13 @@ elseif exists("b:current_syntax") finish endif +let s:cpo_save = &cpo +set cpo&vim + syn clear " Synchronization method -syn sync ccomment +syn sync ccomment syn sync maxlines=100 @@ -39,7 +42,7 @@ syn region revaEOF start='\<|||\>' end='{$}' contains=revaHelpStuff syn case match " basic mathematical and logical operators syn keyword revaoperators + - * / mod /mod negate abs min max umin umax -syn keyword revaoperators and or xor not invert 1+ 1- +syn keyword revaoperators and or xor not invert 1+ 1- syn keyword revaoperators m+ */ */mod m* um* m*/ um/mod fm/mod sm/rem syn keyword revaoperators d+ d- dnegate dabs dmin dmax > < = >> << u< <> @@ -53,10 +56,10 @@ syn keyword revastack >r r> r@ rdrop " address operations syn keyword revamemory @ ! +! c@ c! 2@ 2! align aligned allot allocate here free resize syn keyword revaadrarith chars char+ cells cell+ cell cell- 2cell+ 2cell- 3cell+ 4cell+ -syn keyword revamemblks move fill +syn keyword revamemblks move fill " conditionals -syn keyword revacond if else then =if >if <if <>if if0 ;; catch throw +syn keyword revacond if else then =if >if <if <>if if0 ;; catch throw " iterations syn keyword revaloop while repeat until again @@ -66,18 +69,18 @@ syn keyword revaloop do loop i j leave unloop skip more syn match revaColonDef '\<noname:\|\<:\s+' contains=revaComment syn keyword revaEndOfColonDef ; ;inline syn keyword revadefine constant constant, variable create variable, -syn keyword revadefine user value to +to defer! defer@ defer is does> immediate +syn keyword revadefine user value to +to defer! defer@ defer is does> immediate syn keyword revadefine compile literal ' ['] " Built in words com! -nargs=+ Builtin syn keyword revaBuiltin <args> Builtin execute ahead interp bye >body here pad words make Builtin accept close cr creat delete ekey emit fsize ioerr key? -Builtin mtime open/r open/rw read rename seek space spaces stat +Builtin mtime open/r open/rw read rename seek space spaces stat Builtin tell type type_ write (seek) (argv) (save) 0; 0drop; Builtin >class >lz >name >xt alias alias: appname argc asciiz, asciizl, Builtin body> clamp depth disassemble findprev fnvhash getenv here, -Builtin iterate last! last@ later link lz> lzmax os parse/ peek +Builtin iterate last! last@ later link lz> lzmax os parse/ peek Builtin peek-n pop prior push put rp@ rpick save setenv slurp Builtin stack-empty? stack-iterate stack-size stack: THROW_BADFUNC Builtin THROW_BADLIB THROW_GENERIC used xt>size z, @@ -88,21 +91,21 @@ Builtin chdir g32 k32 u32 getcwd getpid hinst osname stdin stdout Builtin (-lib) (bye) (call) (else) (find) (func) (here) (if (lib) (s0) (s^) Builtin (to~) (while) >in >rel ?literal appstart cold compiling? context? d0 default_class Builtin defer? dict dolstr dostr find-word h0 if) interp isa onexit -Builtin onstartup pdoes pop>ebx prompt rel> rp0 s0 src srcstr state str0 then,> then> tib +Builtin onstartup pdoes pop>ebx prompt rel> rp0 s0 src srcstr state str0 then,> then> tib Builtin tp vector vector! word? xt? .ver revaver revaver# && '' 'constant 'context Builtin 'create 'defer 'does 'forth 'inline 'macro 'macront 'notail 'value 'variable Builtin (.r) (context) (create) (header) (hide) (inline) (p.r) (words~) (xfind) Builtin ++ -- , -2drop -2nip -link -swap . .2x .classes .contexts .funcs .libs .needs .r Builtin .rs .x 00; 0do 0if 1, 2, 3, 2* 2/ 2constant 2variable 3dup 4dup ;then >base >defer Builtin >rr ? ?do @execute @rem appdir argv as back base base! between chain cleanup-libs -Builtin cmove> context?? ctrl-c ctx>name data: defer: defer@def dictgone do_cr eleave -Builtin endcase endof eval exception exec false find func: header heapgone help help/ +Builtin cmove> context?? ctrl-c ctx>name data: defer: defer@def dictgone do_cr eleave +Builtin endcase endof eval exception exec false find func: header heapgone help help/ Builtin hex# hide inline{ last lastxt lib libdir literal, makeexename mnotail ms ms@ -Builtin newclass noop nosavedict notail nul of off on p: padchar parse parseln -Builtin parsews rangeof rdepth remains reset reva revaused rol8 rr> scratch setclass sp +Builtin newclass noop nosavedict notail nul of off on p: padchar parse parseln +Builtin parsews rangeof rdepth remains reset reva revaused rol8 rr> scratch setclass sp Builtin strof super> temp time&date true turnkey? undo vfunc: w! w@ Builtin xchg xchg2 xfind xt>name xwords { {{ }} } _+ _1+ _1- pathsep case \|| -" p[ [''] [ ['] +" p[ [''] [ ['] " debugging @@ -116,11 +119,11 @@ syn keyword revadebug .s dump see " syn region revaCharOps start=+."\s+ skip=+\\"+ end=+"+ " char-number conversion -syn keyword revaconversion s>d >digit digit> >single >double >number >float +syn keyword revaconversion s>d >digit digit> >single >double >number >float " contexts -syn keyword revavocs forth macro inline -syn keyword revavocs context: +syn keyword revavocs forth macro inline +syn keyword revavocs context: syn match revavocs /\<\~[^~ ]*/ syn match revavocs /[^~ ]*\~\>/ @@ -135,7 +138,7 @@ syn match revainteger "\<'.\>" " Strings " syn region revaString start=+\.\?\"+ end=+"+ end=+$+ -syn region revaString start=/"/ skip=/\\"/ end=/"/ +syn region revaString start=/"/ skip=/\\"/ end=/"/ " Comments syn region revaComment start='\\S\s' end='.*' contains=revaTodo @@ -187,5 +190,7 @@ if !exists("did_reva_syntax_inits") endif let b:current_syntax = "reva" +let &cpo = s:cpo_save +unlet s:cpo_save " vim: ts=8:sw=4:nocindent:smartindent: diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim index c2d97dd71..15e3b0170 100644 --- a/runtime/syntax/sshconfig.vim +++ b/runtime/syntax/sshconfig.vim @@ -2,9 +2,7 @@ " Language: OpenSSH client configuration file (ssh_config) " Author: David Necas (Yeti) " Maintainer: Leonard Ehrenfried <leonard.ehrenfried@web.de> -" Modified By: Thilo Six -" Originally: 2009-07-09 -" Last Change: 2011 Oct 31 +" Last Change: 2012 Feb 19 " SSH Version: 5.9p1 " @@ -92,7 +90,8 @@ syn match sshconfigNumber "\d\+" syn match sshconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>" syn match sshconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>" syn match sshconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}[:/]\d\+\>" - +syn match sshconfigHostPort "\(Host \)\@<=.\+" +syn match sshconfigHostPort "\(HostName \)\@<=.\+" " case off syn case ignore |