From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:06:44 +0200 Subject: vim-patch:89bcfda6834a Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 --- runtime/syntax/a65.vim | 47 ++--- runtime/syntax/abap.vim | 69 +++--- runtime/syntax/abaqus.vim | 37 ++-- runtime/syntax/abc.vim | 43 ++-- runtime/syntax/abel.vim | 83 ++++---- runtime/syntax/acedb.vim | 53 ++--- runtime/syntax/aflex.vim | 56 ++--- runtime/syntax/ahdl.vim | 45 ++-- runtime/syntax/amiga.vim | 45 ++-- runtime/syntax/aml.vim | 59 +++--- runtime/syntax/ampl.vim | 48 ++--- runtime/syntax/antlr.vim | 30 +-- runtime/syntax/apache.vim | 63 +++--- runtime/syntax/apachestyle.vim | 33 +-- runtime/syntax/aptconf.vim | 7 +- runtime/syntax/arduino.vim | 13 +- runtime/syntax/asm.vim | 61 +++--- runtime/syntax/asm68k.vim | 113 +++++----- runtime/syntax/asmh8300.vim | 37 +--- runtime/syntax/asn.vim | 55 ++--- runtime/syntax/aspperl.vim | 18 +- runtime/syntax/aspvbs.vim | 54 ++--- runtime/syntax/asterisk.vim | 70 +++---- runtime/syntax/asteriskvm.vim | 43 ++-- runtime/syntax/atlas.vim | 61 +++--- runtime/syntax/automake.vim | 54 ++--- runtime/syntax/ave.vim | 43 ++-- runtime/syntax/ayacc.vim | 60 ++---- runtime/syntax/b.vim | 101 ++++----- runtime/syntax/baan.vim | 67 +++--- runtime/syntax/basic.vim | 51 ++--- runtime/syntax/bc.vim | 41 ++-- runtime/syntax/bib.vim | 44 ++-- runtime/syntax/bindzone.vim | 67 +++--- runtime/syntax/blank.vim | 31 +-- runtime/syntax/bst.vim | 47 ++--- runtime/syntax/btm.vim | 77 +++---- runtime/syntax/bzr.vim | 37 ++-- runtime/syntax/cabal.vim | 39 ++-- runtime/syntax/cfg.vim | 40 ++-- runtime/syntax/ch.vim | 37 ++-- runtime/syntax/change.vim | 29 +-- runtime/syntax/changelog.vim | 66 +++--- runtime/syntax/chaskell.vim | 6 +- runtime/syntax/cheetah.vim | 37 ++-- runtime/syntax/chill.vim | 121 +++++------ runtime/syntax/cl.vim | 73 +++---- runtime/syntax/clean.vim | 81 ++++---- runtime/syntax/clipper.vim | 51 ++--- runtime/syntax/cmake.vim | 47 ++--- runtime/syntax/cobol.vim | 95 ++++----- runtime/syntax/coco.vim | 5 +- runtime/syntax/config.vim | 43 ++-- runtime/syntax/cpp.vim | 54 ++--- runtime/syntax/crontab.vim | 61 +++--- runtime/syntax/csc.vim | 77 +++---- runtime/syntax/csh.vim | 98 ++++----- runtime/syntax/csp.vim | 79 +++---- runtime/syntax/css.vim | 265 +++++++++++------------ runtime/syntax/cterm.vim | 83 ++++---- runtime/syntax/cuda.vim | 13 +- runtime/syntax/cupl.vim | 65 +++--- runtime/syntax/cuplsim.vim | 47 ++--- runtime/syntax/cvs.vim | 33 +-- runtime/syntax/cweb.vim | 35 +--- runtime/syntax/cynlib.vim | 37 +--- runtime/syntax/cynpp.vim | 32 +-- runtime/syntax/datascript.vim | 5 +- runtime/syntax/dcd.vim | 35 ++-- runtime/syntax/dcl.vim | 87 ++++---- runtime/syntax/debchangelog.vim | 41 ++-- runtime/syntax/debcontrol.vim | 59 +++--- runtime/syntax/debsources.vim | 4 +- runtime/syntax/def.vim | 37 ++-- runtime/syntax/desc.vim | 68 +++--- runtime/syntax/desktop.vim | 69 +++--- runtime/syntax/diva.vim | 40 ++-- runtime/syntax/django.vim | 43 ++-- runtime/syntax/dnsmasq.vim | 6 +- runtime/syntax/docbk.vim | 34 +-- runtime/syntax/dosbatch.vim | 85 ++++---- runtime/syntax/dosini.vim | 33 +-- runtime/syntax/dot.vim | 59 +++--- runtime/syntax/dracula.vim | 31 +-- runtime/syntax/dtd.vim | 62 +++--- runtime/syntax/dtml.vim | 43 ++-- runtime/syntax/dtrace.vim | 13 +- runtime/syntax/dylan.vim | 73 +++---- runtime/syntax/dylanintr.vim | 39 ++-- runtime/syntax/dylanlid.vim | 29 +-- runtime/syntax/ecd.vim | 38 ++-- runtime/syntax/edif.vim | 43 ++-- runtime/syntax/eiffel.vim | 97 ++++----- runtime/syntax/elf.vim | 51 ++--- runtime/syntax/elmfilt.vim | 53 ++--- runtime/syntax/erlang.vim | 219 +++++++++---------- runtime/syntax/eruby.vim | 2 +- runtime/syntax/esmtprc.vim | 7 +- runtime/syntax/esqlc.vim | 37 +--- runtime/syntax/esterel.vim | 38 ++-- runtime/syntax/euphoria3.vim | 6 +- runtime/syntax/euphoria4.vim | 6 +- runtime/syntax/eviews.vim | 63 +++--- runtime/syntax/exim.vim | 42 ++-- runtime/syntax/expect.vim | 57 ++--- runtime/syntax/exports.vim | 43 ++-- runtime/syntax/fasm.vim | 5 +- runtime/syntax/fdcc.vim | 99 ++++----- runtime/syntax/fgl.vim | 39 ++-- runtime/syntax/flexwiki.vim | 6 +- runtime/syntax/focexec.vim | 47 ++--- runtime/syntax/form.vim | 83 ++++---- runtime/syntax/forth.vim | 105 ++++------ runtime/syntax/fortran.vim | 6 +- runtime/syntax/foxpro.vim | 57 +++-- runtime/syntax/fstab.vim | 114 +++++----- runtime/syntax/fvwm2m4.vim | 21 +- runtime/syntax/gdb.vim | 41 ++-- runtime/syntax/gdmo.vim | 47 ++--- runtime/syntax/gedcom.vim | 41 ++-- runtime/syntax/gitcommit.vim | 9 +- runtime/syntax/gitrebase.vim | 4 +- runtime/syntax/gitsendemail.vim | 8 +- runtime/syntax/gkrellmrc.vim | 60 ++---- runtime/syntax/gnash.vim | 7 +- runtime/syntax/gnuplot.vim | 93 ++++----- runtime/syntax/gp.vim | 50 ++--- runtime/syntax/grads.vim | 43 ++-- runtime/syntax/gretl.vim | 61 ++---- runtime/syntax/groovy.vim | 145 ++++++------- runtime/syntax/gsp.vim | 19 +- runtime/syntax/gtkrc.vim | 112 +++++----- runtime/syntax/haml.vim | 4 +- runtime/syntax/hamster.vim | 30 +-- runtime/syntax/haskell.vim | 118 +++++------ runtime/syntax/haste.vim | 7 +- runtime/syntax/hastepreproc.vim | 19 +- runtime/syntax/hb.vim | 49 ++--- runtime/syntax/hercules.vim | 50 ++--- runtime/syntax/hex.vim | 51 ++--- runtime/syntax/hog.vim | 5 +- runtime/syntax/hostsaccess.vim | 8 +- runtime/syntax/html.vim | 134 ++++++------ runtime/syntax/htmlcheetah.vim | 18 +- runtime/syntax/htmldjango.vim | 18 +- runtime/syntax/htmlm4.vim | 20 +- runtime/syntax/htmlos.vim | 79 +++---- runtime/syntax/ia64.vim | 73 +++---- runtime/syntax/icemenu.vim | 6 +- runtime/syntax/icon.vim | 99 ++++----- runtime/syntax/idlang.vim | 57 ++--- runtime/syntax/inform.vim | 116 +++++------ runtime/syntax/inittab.vim | 46 ++-- runtime/syntax/ipfilter.vim | 7 +- runtime/syntax/ishd.vim | 53 ++--- runtime/syntax/iss.vim | 75 +++---- runtime/syntax/ist.vim | 49 ++--- runtime/syntax/jal.vim | 141 ++++++------- runtime/syntax/jam.vim | 169 +++++++-------- runtime/syntax/jargon.vim | 29 +-- runtime/syntax/java.vim | 145 ++++++------- runtime/syntax/javacc.vim | 37 +--- runtime/syntax/javascript.vim | 94 ++++----- runtime/syntax/jess.vim | 65 +++--- runtime/syntax/jgraph.vim | 33 +-- runtime/syntax/jproperties.vim | 43 ++-- runtime/syntax/json.vim | 61 +++--- runtime/syntax/jsp.vim | 51 ++--- runtime/syntax/kix.vim | 90 ++++---- runtime/syntax/kscript.vim | 53 ++--- runtime/syntax/kwt.vim | 49 ++--- runtime/syntax/lace.vim | 87 ++++---- runtime/syntax/latte.vim | 43 ++-- runtime/syntax/ldif.vim | 34 ++- runtime/syntax/lex.vim | 7 +- runtime/syntax/lhaskell.vim | 52 ++--- runtime/syntax/lifelines.vim | 77 +++---- runtime/syntax/lilo.vim | 130 +++++------- runtime/syntax/lisp.vim | 97 +++++---- runtime/syntax/lite.vim | 65 +++--- runtime/syntax/logtalk.vim | 73 +++---- runtime/syntax/lotos.vim | 35 ++-- runtime/syntax/lout.vim | 81 +++----- runtime/syntax/lpc.vim | 171 +++++++-------- runtime/syntax/lprolog.vim | 69 +++--- runtime/syntax/lscript.vim | 55 ++--- runtime/syntax/lss.vim | 112 +++++----- runtime/syntax/lua.vim | 63 +++--- runtime/syntax/m4.vim | 53 ++--- runtime/syntax/make.vim | 65 +++--- runtime/syntax/maple.vim | 151 +++++++------- runtime/syntax/markdown.vim | 31 ++- runtime/syntax/mason.vim | 36 +--- runtime/syntax/master.vim | 31 +-- runtime/syntax/matlab.vim | 79 +++---- runtime/syntax/maxima.vim | 65 +++--- runtime/syntax/mel.vim | 79 +++---- runtime/syntax/mf.vim | 67 +++--- runtime/syntax/mgl.vim | 71 +++---- runtime/syntax/mgp.vim | 46 ++-- runtime/syntax/mma.vim | 78 ++++--- runtime/syntax/mmix.vim | 73 +++---- runtime/syntax/mmp.vim | 10 +- runtime/syntax/modsim3.vim | 48 ++--- runtime/syntax/modula2.vim | 47 ++--- runtime/syntax/modula3.vim | 31 +-- runtime/syntax/monk.vim | 57 ++--- runtime/syntax/moo.vim | 4 +- runtime/syntax/mp.vim | 37 +--- runtime/syntax/msidl.vim | 65 +++--- runtime/syntax/msmessages.vim | 7 +- runtime/syntax/msql.vim | 73 +++---- runtime/syntax/mupad.vim | 42 ++-- runtime/syntax/mush.vim | 60 +++--- runtime/syntax/muttrc.vim | 313 +++++++++++++--------------- runtime/syntax/mysql.vim | 41 ++-- runtime/syntax/named.vim | 93 ++++----- runtime/syntax/nasm.vim | 194 ++++++++--------- runtime/syntax/nastran.vim | 62 +++--- runtime/syntax/natural.vim | 11 +- runtime/syntax/ncf.vim | 71 +++---- runtime/syntax/netrw.vim | 5 +- runtime/syntax/nqc.vim | 91 ++++---- runtime/syntax/nroff.vim | 115 +++++----- runtime/syntax/nsis.vim | 81 +++----- runtime/syntax/obj.vim | 47 ++--- runtime/syntax/objcpp.vim | 18 +- runtime/syntax/ocaml.vim | 143 ++++++------- runtime/syntax/occam.vim | 68 +++--- runtime/syntax/omnimark.vim | 39 ++-- runtime/syntax/openroad.vim | 52 ++--- runtime/syntax/opl.vim | 31 +-- runtime/syntax/ora.vim | 54 ++--- runtime/syntax/papp.vim | 29 +-- runtime/syntax/pascal.vim | 91 ++++---- runtime/syntax/pcap.vim | 33 +-- runtime/syntax/pccts.vim | 61 ++---- runtime/syntax/perl6.vim | 339 +++++++++++++++--------------- runtime/syntax/pfmain.vim | 50 ++--- runtime/syntax/php.vim | 202 ++++++++---------- runtime/syntax/pic.vim | 59 +++--- runtime/syntax/pike.vim | 89 ++++---- runtime/syntax/pilrc.vim | 48 ++--- runtime/syntax/pine.vim | 33 +-- runtime/syntax/pli.vim | 96 ++++----- runtime/syntax/plm.vim | 67 +++--- runtime/syntax/plp.vim | 18 +- runtime/syntax/plsql.vim | 91 ++++---- runtime/syntax/po.vim | 109 +++++----- runtime/syntax/pod.vim | 43 ++-- runtime/syntax/postscr.vim | 125 +++++------ runtime/syntax/pov.vim | 10 +- runtime/syntax/povini.vim | 10 +- runtime/syntax/ppd.vim | 41 ++-- runtime/syntax/ppwiz.vim | 49 ++--- runtime/syntax/prescribe.vim | 33 +-- runtime/syntax/procmail.vim | 45 ++-- runtime/syntax/progress.vim | 77 +++---- runtime/syntax/prolog.vim | 74 +++---- runtime/syntax/promela.vim | 7 +- runtime/syntax/proto.vim | 5 +- runtime/syntax/psf.vim | 40 ++-- runtime/syntax/ptcap.vim | 56 ++--- runtime/syntax/purifylog.vim | 99 ++++----- runtime/syntax/pyrex.vim | 44 ++-- runtime/syntax/python.vim | 86 ++++---- runtime/syntax/radiance.vim | 51 ++--- runtime/syntax/ratpoison.vim | 49 ++--- runtime/syntax/rc.vim | 97 ++++----- runtime/syntax/rcs.vim | 35 ++-- runtime/syntax/rcslog.vim | 27 +-- runtime/syntax/rebol.vim | 123 +++++------ runtime/syntax/redif.vim | 6 +- runtime/syntax/registry.vim | 42 ++-- runtime/syntax/remind.vim | 52 ++--- runtime/syntax/resolv.vim | 62 +++--- runtime/syntax/reva.vim | 9 +- runtime/syntax/rexx.vim | 137 ++++++------ runtime/syntax/rib.vim | 31 +-- runtime/syntax/robots.vim | 40 ++-- runtime/syntax/rpcgen.vim | 48 ++--- runtime/syntax/rpl.vim | 141 ++++++------- runtime/syntax/rtf.vim | 57 ++--- runtime/syntax/ruby.vim | 439 +++++++++++++++++++++++++++------------ runtime/syntax/samba.vim | 35 ++-- runtime/syntax/sas.vim | 113 +++++----- runtime/syntax/sass.vim | 12 +- runtime/syntax/sather.vim | 73 +++---- runtime/syntax/scala.vim | 5 +- runtime/syntax/scheme.vim | 55 ++--- runtime/syntax/scilab.vim | 85 ++++---- runtime/syntax/sd.vim | 40 ++-- runtime/syntax/sdl.vim | 62 +++--- runtime/syntax/sed.vim | 80 ++++--- runtime/syntax/sendpr.vim | 7 +- runtime/syntax/sgml.vim | 7 +- runtime/syntax/sgmldecl.vim | 47 ++--- runtime/syntax/sgmllnx.vim | 49 ++--- runtime/syntax/sh.vim | 7 +- runtime/syntax/sicad.vim | 77 +++---- runtime/syntax/simula.vim | 68 +++--- runtime/syntax/sinda.vim | 71 +++---- runtime/syntax/sindacmp.vim | 33 +-- runtime/syntax/sindaout.vim | 59 ++---- runtime/syntax/sisu.vim | 6 +- runtime/syntax/skill.vim | 57 ++--- runtime/syntax/sl.vim | 73 +++---- runtime/syntax/slang.vim | 77 +++---- runtime/syntax/slice.vim | 49 ++--- runtime/syntax/slrnrc.vim | 75 +++---- runtime/syntax/slrnsc.vim | 57 ++--- runtime/syntax/sm.vim | 52 ++--- runtime/syntax/smarty.vim | 38 ++-- runtime/syntax/smcl.vim | 5 +- runtime/syntax/smil.vim | 63 +++--- runtime/syntax/smith.vim | 35 ++-- runtime/syntax/sml.vim | 111 +++++----- runtime/syntax/snnsnet.vim | 28 +-- runtime/syntax/snnspat.vim | 34 ++- runtime/syntax/snnsres.vim | 32 ++- runtime/syntax/snobol4.vim | 77 +++---- runtime/syntax/spec.vim | 139 ++++++------- runtime/syntax/specman.vim | 81 ++++---- runtime/syntax/spice.vim | 43 ++-- runtime/syntax/splint.vim | 115 +++++----- runtime/syntax/spup.vim | 127 ++++++----- runtime/syntax/spyce.vim | 17 +- runtime/syntax/sql.vim | 7 +- runtime/syntax/sqlanywhere.vim | 7 +- runtime/syntax/sqlforms.vim | 54 ++--- runtime/syntax/sqlhana.vim | 7 +- runtime/syntax/sqlinformix.vim | 75 +++---- runtime/syntax/sqlj.vim | 41 ++-- runtime/syntax/sqr.vim | 121 ++++------- runtime/syntax/squid.vim | 43 ++-- runtime/syntax/srec.vim | 49 ++--- runtime/syntax/sshconfig.vim | 74 +++---- runtime/syntax/sshdconfig.vim | 82 +++----- runtime/syntax/st.vim | 47 ++--- runtime/syntax/stata.vim | 5 +- runtime/syntax/stp.vim | 59 +++--- runtime/syntax/strace.vim | 50 ++--- runtime/syntax/svn.vim | 39 ++-- runtime/syntax/systemverilog.vim | 42 ++-- runtime/syntax/tads.vim | 97 ++++----- runtime/syntax/tags.vim | 33 +-- runtime/syntax/tak.vim | 73 +++---- runtime/syntax/takcmp.vim | 37 ++-- runtime/syntax/takout.vim | 55 ++--- runtime/syntax/taskdata.vim | 7 +- runtime/syntax/taskedit.vim | 7 +- runtime/syntax/tasm.vim | 47 ++--- runtime/syntax/tcl.vim | 81 ++++---- runtime/syntax/tex.vim | 39 +--- runtime/syntax/texinfo.vim | 81 ++++---- runtime/syntax/texmf.vim | 58 +++--- runtime/syntax/tf.vim | 75 +++---- runtime/syntax/tli.vim | 41 ++-- runtime/syntax/tpp.vim | 59 ++---- runtime/syntax/trasys.vim | 73 +++---- runtime/syntax/trustees.vim | 5 +- runtime/syntax/tsalt.vim | 79 +++---- runtime/syntax/tsscl.vim | 61 +++--- runtime/syntax/tssgm.vim | 57 ++--- runtime/syntax/tssop.vim | 47 ++--- runtime/syntax/uc.vim | 115 +++++----- runtime/syntax/uil.vim | 56 ++--- runtime/syntax/upstart.vim | 5 +- runtime/syntax/vb.vim | 63 +++--- runtime/syntax/vera.vim | 135 ++++++------ runtime/syntax/verilog.vim | 61 ++---- runtime/syntax/verilogams.vim | 61 ++---- runtime/syntax/vhdl.vim | 55 ++--- runtime/syntax/virata.vim | 112 +++++----- runtime/syntax/vmasm.vim | 81 ++++---- runtime/syntax/vrml.vim | 77 +++---- runtime/syntax/vroom.vim | 7 +- runtime/syntax/vsejcl.vim | 35 ++-- runtime/syntax/wdiff.vim | 30 +-- runtime/syntax/web.vim | 15 +- runtime/syntax/webmacro.vim | 53 ++--- runtime/syntax/winbatch.vim | 41 ++-- runtime/syntax/wml.vim | 62 ++---- runtime/syntax/wsml.vim | 76 +++---- runtime/syntax/xdefaults.vim | 59 +++--- runtime/syntax/xf86conf.vim | 8 +- runtime/syntax/xkb.vim | 76 +++---- runtime/syntax/xmath.vim | 71 +++---- runtime/syntax/xpm.vim | 35 ++-- runtime/syntax/xpm2.vim | 38 ++-- runtime/syntax/xs.vim | 47 ++--- runtime/syntax/xxd.vim | 27 +-- runtime/syntax/yacc.vim | 3 - runtime/syntax/z8a.vim | 47 ++--- 394 files changed, 9449 insertions(+), 13365 deletions(-) (limited to 'runtime/syntax') diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim index 94198e6a42..5ade809a1f 100644 --- a/runtime/syntax/a65.vim +++ b/runtime/syntax/a65.vim @@ -3,11 +3,8 @@ " Maintainer: Clemens Kirchgatterer " Last Change: 2014 Jan 05 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -138,29 +135,21 @@ syn match a65End excludenl /end$/ contained syn match a65Continue "\\$" contained " Define the default highlighting. -" 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_a65_syntax_inits") - if version < 508 - let did_a65_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink a65Section Special - HiLink a65Address Special - HiLink a65Comment Comment - HiLink a65PreProc PreProc - HiLink a65Number Number - HiLink a65String String - HiLink a65Type Statement - HiLink a65Opcode Type - HiLink a65PC Error - HiLink a65Todo Todo - HiLink a65HiLo Number - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink a65Section Special +HiLink a65Address Special +HiLink a65Comment Comment +HiLink a65PreProc PreProc +HiLink a65Number Number +HiLink a65String String +HiLink a65Type Statement +HiLink a65Opcode Type +HiLink a65PC Error +HiLink a65Todo Todo +HiLink a65HiLo Number + +delcommand HiLink let b:current_syntax = "a65" diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim index 1d1f6afd0d..ac5504a952 100644 --- a/runtime/syntax/abap.vim +++ b/runtime/syntax/abap.vim @@ -5,11 +5,8 @@ " Last Change: 2013 Jun 13 " Comment: Thanks to EPI-USE Labs for all your assistance. :) -" For version < 6.0: Clear all syntax items -" For version >= 6.0: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -43,11 +40,7 @@ syn match abapStringEscape contained "``" syn match abapNumber "\-\=\<\d\+\>" syn region abapHex matchgroup=abapHex start="X'" end="'" -if version >= 600 - setlocal iskeyword=48-57,_,A-Z,a-z,/ -else - set iskeyword=48-57,_,A-Z,a-z,/ -endif +setlocal iskeyword=48-57,_,A-Z,a-z,/ syn match abapNamespace "\= 508 || !exists("did_abap_syntax_inits") - if version < 508 - let did_abap_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink abapError Error - HiLink abapComment Comment - HiLink abapInclude Include - HiLink abapStatement Statement - HiLink abapComplexStatement Statement - HiLink abapSpecial Special - HiLink abapNamespace Special - HiLink abapSpecialTables Special - HiLink abapSymbolOperator abapOperator - HiLink abapOperator Operator - HiLink abapCharString String - HiLink abapString String - HiLink abapFloat Float - HiLink abapTypes Type - HiLink abapSymbol Structure - HiLink abapStructure Structure - HiLink abapField Variable - HiLink abapNumber Number - HiLink abapHex Number - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink abapError Error +HiLink abapComment Comment +HiLink abapInclude Include +HiLink abapStatement Statement +HiLink abapComplexStatement Statement +HiLink abapSpecial Special +HiLink abapNamespace Special +HiLink abapSpecialTables Special +HiLink abapSymbolOperator abapOperator +HiLink abapOperator Operator +HiLink abapCharString String +HiLink abapString String +HiLink abapFloat Float +HiLink abapTypes Type +HiLink abapSymbol Structure +HiLink abapStructure Structure +HiLink abapField Variable +HiLink abapNumber Number +HiLink abapHex Number + +delcommand HiLink let b:current_syntax = "abap" diff --git a/runtime/syntax/abaqus.vim b/runtime/syntax/abaqus.vim index cf4b0828fa..ddf0255845 100644 --- a/runtime/syntax/abaqus.vim +++ b/runtime/syntax/abaqus.vim @@ -4,11 +4,8 @@ " Last Change: 2002 Feb 24 " Remark: Huge improvement in folding performance--see filetype plugin -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -25,24 +22,16 @@ syn match abaqusValue "=\s*[^,]*"lc=1 contained display syn match abaqusBadLine "^\s\+\*.*" display " Define the default highlighting. -" 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_abaqus_syn_inits") - if version < 508 - let did_abaqus_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later - HiLink abaqusComment Comment - HiLink abaqusKeyword Statement - HiLink abaqusParameter Identifier - HiLink abaqusValue Constant - HiLink abaqusBadLine Error - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" The default methods for highlighting. Can be overridden later +HiLink abaqusComment Comment +HiLink abaqusKeyword Statement +HiLink abaqusParameter Identifier +HiLink abaqusValue Constant +HiLink abaqusBadLine Error + +delcommand HiLink let b:current_syntax = "abaqus" diff --git a/runtime/syntax/abc.vim b/runtime/syntax/abc.vim index 3dc098e730..68f0cf16ff 100644 --- a/runtime/syntax/abc.vim +++ b/runtime/syntax/abc.vim @@ -4,11 +4,8 @@ " URL: http://perun.hscs.wmin.ac.uk/~jra/vim/syntax/abc.vim " Last Change: 27th April 2001 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -36,28 +33,20 @@ syn match abcComment "%.*$" " Define the default highlighting. -" 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_abc_syn_inits") - if version < 508 - let did_abc_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink abcComment Comment - HiLink abcHeadField Type - HiLink abcBodyField Special - HiLink abcBar Statement - HiLink abcTuple Statement - HiLink abcBroken Statement - HiLink abcTie Statement - HiLink abcGuitarChord Identifier - HiLink abcNote Constant - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink abcComment Comment +HiLink abcHeadField Type +HiLink abcBodyField Special +HiLink abcBar Statement +HiLink abcTuple Statement +HiLink abcBroken Statement +HiLink abcTie Statement +HiLink abcGuitarChord Identifier +HiLink abcNote Constant + +delcommand HiLink let b:current_syntax = "abc" diff --git a/runtime/syntax/abel.vim b/runtime/syntax/abel.vim index 05e8dac913..dfa872f422 100644 --- a/runtime/syntax/abel.vim +++ b/runtime/syntax/abel.vim @@ -3,11 +3,8 @@ " Maintainer: John Cook " Last Change: 2011 Dec 27 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -123,48 +120,40 @@ endif syn sync minlines=1 " Define the default highlighting. -" 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_abel_syn_inits") - if version < 508 - let did_abel_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default highlighting. - HiLink abelHeader abelStatement - HiLink abelSection abelStatement - HiLink abelDeclaration abelStatement - HiLink abelLogicalOperator abelOperator - HiLink abelRangeOperator abelOperator - HiLink abelAlternateOperator abelOperator - HiLink abelArithmeticOperator abelOperator - HiLink abelRelationalOperator abelOperator - HiLink abelAssignmentOperator abelOperator - HiLink abelTruthTableOperator abelOperator - HiLink abelSpecifier abelStatement - HiLink abelOperator abelStatement - HiLink abelStatement Statement - HiLink abelIdentifier Identifier - HiLink abelTypeId abelType - HiLink abelTypeIdChar abelType - HiLink abelType Type - HiLink abelNumber abelString - HiLink abelString String - HiLink abelConstant Constant - HiLink abelComment Comment - HiLink abelExtension abelSpecial - HiLink abelSpecialChar abelSpecial - HiLink abelTypeIdEnd abelSpecial - HiLink abelSpecial Special - HiLink abelDirective PreProc - HiLink abelTodo Todo - HiLink abelError Error - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" The default highlighting. +HiLink abelHeader abelStatement +HiLink abelSection abelStatement +HiLink abelDeclaration abelStatement +HiLink abelLogicalOperator abelOperator +HiLink abelRangeOperator abelOperator +HiLink abelAlternateOperator abelOperator +HiLink abelArithmeticOperator abelOperator +HiLink abelRelationalOperator abelOperator +HiLink abelAssignmentOperator abelOperator +HiLink abelTruthTableOperator abelOperator +HiLink abelSpecifier abelStatement +HiLink abelOperator abelStatement +HiLink abelStatement Statement +HiLink abelIdentifier Identifier +HiLink abelTypeId abelType +HiLink abelTypeIdChar abelType +HiLink abelType Type +HiLink abelNumber abelString +HiLink abelString String +HiLink abelConstant Constant +HiLink abelComment Comment +HiLink abelExtension abelSpecial +HiLink abelSpecialChar abelSpecial +HiLink abelTypeIdEnd abelSpecial +HiLink abelSpecial Special +HiLink abelDirective PreProc +HiLink abelTodo Todo +HiLink abelError Error + +delcommand HiLink let b:current_syntax = "abel" diff --git a/runtime/syntax/acedb.vim b/runtime/syntax/acedb.vim index 114e4aba9e..43cec3ac29 100644 --- a/runtime/syntax/acedb.vim +++ b/runtime/syntax/acedb.vim @@ -7,11 +7,8 @@ " Syntax file to handle all $ACEDB/wspec/*.wrm files, primarily models.wrm " AceDB software is available from http://www.acedb.org -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -86,35 +83,27 @@ syn region acedbString start=/"/ end=/"/ skip=/\\"/ oneline " Rest of syntax highlighting rules start here " Define the default highlighting. -" 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_acedb_syn_inits") - if version < 508 - let did_acedb_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link - HiLink acedbMagic Special - HiLink acedbHyb Special - HiLink acedbType Type - HiLink acedbOption Type - HiLink acedbSubclass Type - HiLink acedbSubtag Include - HiLink acedbFlag Include - HiLink acedbTag Include - HiLink acedbClass Todo - HiLink acedbHelp Todo - HiLink acedbXref Identifier - HiLink acedbModifier Label - HiLink acedbComment Comment - HiLink acedbBlock ModeMsg - HiLink acedbNumber Number - HiLink acedbString String +HiLink acedbMagic Special +HiLink acedbHyb Special +HiLink acedbType Type +HiLink acedbOption Type +HiLink acedbSubclass Type +HiLink acedbSubtag Include +HiLink acedbFlag Include +HiLink acedbTag Include +HiLink acedbClass Todo +HiLink acedbHelp Todo +HiLink acedbXref Identifier +HiLink acedbModifier Label +HiLink acedbComment Comment +HiLink acedbBlock ModeMsg +HiLink acedbNumber Number +HiLink acedbString String - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "acedb" diff --git a/runtime/syntax/aflex.vim b/runtime/syntax/aflex.vim index 592c98e4f3..21b78d0d85 100644 --- a/runtime/syntax/aflex.vim +++ b/runtime/syntax/aflex.vim @@ -7,21 +7,14 @@ " Comment: Replaced sourcing c.vim file by ada.vim and rename lex* " in aflex* -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif " Read the Ada syntax to start with -if version < 600 - so :p:h/ada.vim -else - runtime! syntax/ada.vim - unlet b:current_syntax -endif +runtime! syntax/ada.vim +unlet b:current_syntax " --- AfLex stuff --- @@ -69,31 +62,22 @@ syn sync match aflexSyncPat groupthere aflexPatBlock "^<$" syn sync match aflexSyncPat groupthere aflexPatBlock "^%%$" " Define the default highlighting. -" 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_aflex_syntax_inits") - if version < 508 - let did_aflex_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - HiLink aflexSlashQuote aflexPat - HiLink aflexBrace aflexPat - HiLink aflexAbbrvComment aflexPatComment - - HiLink aflexAbbrv SpecialChar - HiLink aflexAbbrvRegExp Macro - HiLink aflexCFunctions Function - HiLink aflexMorePat SpecialChar - HiLink aflexPat Function - HiLink aflexPatComment Comment - HiLink aflexPatString Function - HiLink aflexPatTag Special - HiLink aflexSep Delimiter - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link +HiLink aflexSlashQuote aflexPat +HiLink aflexBrace aflexPat +HiLink aflexAbbrvComment aflexPatComment + +HiLink aflexAbbrv SpecialChar +HiLink aflexAbbrvRegExp Macro +HiLink aflexCFunctions Function +HiLink aflexMorePat SpecialChar +HiLink aflexPat Function +HiLink aflexPatComment Comment +HiLink aflexPatString Function +HiLink aflexPatTag Special +HiLink aflexSep Delimiter +delcommand HiLink let b:current_syntax = "aflex" diff --git a/runtime/syntax/ahdl.vim b/runtime/syntax/ahdl.vim index b1417c374d..82f3918de8 100644 --- a/runtime/syntax/ahdl.vim +++ b/runtime/syntax/ahdl.vim @@ -3,11 +3,8 @@ " Maintainer: John Cook " Last Change: 2001 Apr 25 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -66,29 +63,21 @@ syn match ahdlSpecialChar "[\[\]().,;]" syn sync minlines=1 " Define the default highlighting. -" 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_ahdl_syn_inits") - if version < 508 - let did_ahdl_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default highlighting. - HiLink ahdlNumber ahdlString - HiLink ahdlMegafunction ahdlIdentifier - HiLink ahdlSpecialChar SpecialChar - HiLink ahdlKeyword Statement - HiLink ahdlString String - HiLink ahdlComment Comment - HiLink ahdlIdentifier Identifier - HiLink ahdlOperator Operator - HiLink ahdlTodo Todo - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" The default highlighting. +HiLink ahdlNumber ahdlString +HiLink ahdlMegafunction ahdlIdentifier +HiLink ahdlSpecialChar SpecialChar +HiLink ahdlKeyword Statement +HiLink ahdlString String +HiLink ahdlComment Comment +HiLink ahdlIdentifier Identifier +HiLink ahdlOperator Operator +HiLink ahdlTodo Todo + +delcommand HiLink let b:current_syntax = "ahdl" " vim:ts=8 diff --git a/runtime/syntax/amiga.vim b/runtime/syntax/amiga.vim index 4ccab1950f..e094cfc744 100644 --- a/runtime/syntax/amiga.vim +++ b/runtime/syntax/amiga.vim @@ -5,11 +5,8 @@ " Version: 7 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_AMIGA -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -72,29 +69,21 @@ syn match amiComment ";.*$" contains=amiCommentGroup syn sync lines=50 " Define the default highlighting. -" 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_amiga_syn_inits") - if version < 508 - let did_amiga_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink amiAlias Type - HiLink amiComment Comment - HiLink amiDev Type - HiLink amiEcho String - HiLink amiElse Statement - HiLink amiError Error - HiLink amiKey Statement - HiLink amiNumber Number - HiLink amiString String - HiLink amiTest Special - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink amiAlias Type +HiLink amiComment Comment +HiLink amiDev Type +HiLink amiEcho String +HiLink amiElse Statement +HiLink amiError Error +HiLink amiKey Statement +HiLink amiNumber Number +HiLink amiString String +HiLink amiTest Special + +delcommand HiLink let b:current_syntax = "amiga" diff --git a/runtime/syntax/aml.vim b/runtime/syntax/aml.vim index 7cb16f1c1f..1b975ccabe 100644 --- a/runtime/syntax/aml.vim +++ b/runtime/syntax/aml.vim @@ -9,11 +9,8 @@ " of [], in order to avoid -read highlighted, " or [quote] strings highlighted -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -123,35 +120,27 @@ syn region amlSkip matchgroup=amlOutput start="&typ" end="$" contains=amlVar syn region amlSkip matchgroup=amlOutput start="&type" end="$" contains=amlVar " Define the default highlighting. -" 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_aml_syntax_inits") - if version < 508 - let did_aml_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink amlComment Comment - HiLink amlNumber Number - HiLink amlQuote String - HiLink amlVar Identifier - HiLink amlVar2 Identifier - HiLink amlFunction PreProc - HiLink amlDir Statement - HiLink amlDir2 Statement - HiLink amlDirSym Statement - HiLink amlOutput Statement - HiLink amlArcCmd ModeMsg - HiLink amlFormedCmd amlArcCmd - HiLink amlTabCmd amlArcCmd - HiLink amlInfoCmd amlArcCmd - HiLink amlVtrCmd amlArcCmd - HiLink amlFormed amlArcCmd - HiLink amlTab amlArcCmd - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink amlComment Comment +HiLink amlNumber Number +HiLink amlQuote String +HiLink amlVar Identifier +HiLink amlVar2 Identifier +HiLink amlFunction PreProc +HiLink amlDir Statement +HiLink amlDir2 Statement +HiLink amlDirSym Statement +HiLink amlOutput Statement +HiLink amlArcCmd ModeMsg +HiLink amlFormedCmd amlArcCmd +HiLink amlTabCmd amlArcCmd +HiLink amlInfoCmd amlArcCmd +HiLink amlVtrCmd amlArcCmd +HiLink amlFormed amlArcCmd +HiLink amlTab amlArcCmd + +delcommand HiLink let b:current_syntax = "aml" diff --git a/runtime/syntax/ampl.vim b/runtime/syntax/ampl.vim index 7f4dfa9942..99a683a0f4 100644 --- a/runtime/syntax/ampl.vim +++ b/runtime/syntax/ampl.vim @@ -3,9 +3,8 @@ " Last Change: 2003 May 11 -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -115,33 +114,26 @@ syn keyword amplTodo contained TODO FIXME XXX -if version >= 508 || !exists("did_ampl_syntax_inits") - if version < 508 - let did_ampl_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +command -nargs=+ HiLink hi def link - " The default methods for highlighting. Can be overridden later. - HiLink amplEntityKeyword Keyword - HiLink amplType Type - HiLink amplStatement Statement - HiLink amplOperators Operator - HiLink amplBasicOperators Operator - HiLink amplConditional Conditional - HiLink amplRepeat Repeat - HiLink amplStrings String - HiLink amplNumerics Number - HiLink amplSetFunction Function - HiLink amplBuiltInFunction Function - HiLink amplRandomGenerator Function - HiLink amplComment Comment - HiLink amplDotSuffix Special - HiLink amplPiecewise Special +" The default methods for highlighting. Can be overridden later. +HiLink amplEntityKeyword Keyword +HiLink amplType Type +HiLink amplStatement Statement +HiLink amplOperators Operator +HiLink amplBasicOperators Operator +HiLink amplConditional Conditional +HiLink amplRepeat Repeat +HiLink amplStrings String +HiLink amplNumerics Number +HiLink amplSetFunction Function +HiLink amplBuiltInFunction Function +HiLink amplRandomGenerator Function +HiLink amplComment Comment +HiLink amplDotSuffix Special +HiLink amplPiecewise Special - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "ampl" diff --git a/runtime/syntax/antlr.vim b/runtime/syntax/antlr.vim index 19000293fb..2ac38d7747 100644 --- a/runtime/syntax/antlr.vim +++ b/runtime/syntax/antlr.vim @@ -4,11 +4,8 @@ " LastChange: 02 May 2001 " Original: Comes from JavaCC.vim -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -18,12 +15,8 @@ endif " Those files usually have the extension *.jj " source the java.vim file -if version < 600 - so :p:h/java.vim -else - runtime! syntax/java.vim - unlet b:current_syntax -endif +runtime! syntax/java.vim +unlet b:current_syntax "remove catching errors caused by wrong parenthesis (does not work in antlr "files) (first define them in case they have not been defined in java) @@ -53,17 +46,10 @@ syn match antlrSep "[|:]\|\.\." syn keyword antlrActionToken TOKEN SKIP MORE SPECIAL_TOKEN syn keyword antlrError DEBUG IGNORE_IN_BNF -if version >= 508 || !exists("did_antlr_syntax_inits") - if version < 508 - let did_antlr_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - HiLink antlrSep Statement - HiLink antlrPackages Statement - delcommand HiLink -endif +command -nargs=+ HiLink hi def link +HiLink antlrSep Statement +HiLink antlrPackages Statement +delcommand HiLink let b:current_syntax = "antlr" diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim index 85cda4095a..b556fa350d 100644 --- a/runtime/syntax/apache.vim +++ b/runtime/syntax/apache.vim @@ -9,13 +9,9 @@ " make it really linewise? " + add `display' where appropriate -" Setup -if version >= 600 - if exists("b:current_syntax") - finish - endif -else - syntax clear +" quit when a syntax file was already loaded +if exists("b:current_syntax") + finish endif syn case ignore @@ -178,37 +174,30 @@ syn match apacheSection "<\/\=\(]*>" contains=apacheAnything syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP " Define the default highlighting -if version >= 508 || !exists("did_apache_syntax_inits") - if version < 508 - let did_apache_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +command -nargs=+ HiLink hi def link - HiLink apacheAllowOverride apacheDeclaration - HiLink apacheAllowOverrideValue apacheOption - HiLink apacheAuthType apacheDeclaration - HiLink apacheAuthTypeValue apacheOption - HiLink apacheOptionOption apacheOption - HiLink apacheDeclaration Function - HiLink apacheAnything apacheOption - HiLink apacheOption Number - HiLink apacheComment Comment - HiLink apacheFixme Todo - HiLink apacheLimitSectionKeyword apacheLimitSection - HiLink apacheLimitSection apacheSection - HiLink apacheSection Label - HiLink apacheMethodOption Type - HiLink apacheAllowDeny Include - HiLink apacheAllowDenyValue Identifier - HiLink apacheOrder Special - HiLink apacheOrderValue String - HiLink apacheString String - HiLink apacheError Error - HiLink apacheUserID Number +HiLink apacheAllowOverride apacheDeclaration +HiLink apacheAllowOverrideValue apacheOption +HiLink apacheAuthType apacheDeclaration +HiLink apacheAuthTypeValue apacheOption +HiLink apacheOptionOption apacheOption +HiLink apacheDeclaration Function +HiLink apacheAnything apacheOption +HiLink apacheOption Number +HiLink apacheComment Comment +HiLink apacheFixme Todo +HiLink apacheLimitSectionKeyword apacheLimitSection +HiLink apacheLimitSection apacheSection +HiLink apacheSection Label +HiLink apacheMethodOption Type +HiLink apacheAllowDeny Include +HiLink apacheAllowDenyValue Identifier +HiLink apacheOrder Special +HiLink apacheOrderValue String +HiLink apacheString String +HiLink apacheError Error +HiLink apacheUserID Number - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "apache" diff --git a/runtime/syntax/apachestyle.vim b/runtime/syntax/apachestyle.vim index 375fc70a9c..53d5907b9e 100644 --- a/runtime/syntax/apachestyle.vim +++ b/runtime/syntax/apachestyle.vim @@ -20,11 +20,8 @@ " " -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -41,25 +38,17 @@ syn match apTagOption contained / [-\/_\.:*a-zA-Z0-9]\+/ms=s+1 syn match apTagError contained /[^>]= 508 || !exists("did_apachestyle_syn_inits") - if version < 508 - let did_apachestyle_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link - HiLink apComment Comment - HiLink apOption Keyword - "HiLink apLastValue Identifier ugly? - HiLink apTag Special - HiLink apTagOption Identifier - HiLink apTagError Error +HiLink apComment Comment +HiLink apOption Keyword +"HiLink apLastValue Identifier ugly? +HiLink apTag Special +HiLink apTagOption Identifier +HiLink apTagError Error - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "apachestyle" " vim: ts=8 diff --git a/runtime/syntax/aptconf.vim b/runtime/syntax/aptconf.vim index 7a31b2d15e..8cb14321e2 100644 --- a/runtime/syntax/aptconf.vim +++ b/runtime/syntax/aptconf.vim @@ -3,12 +3,9 @@ " Maintainer: Yann Amar " Last Change: 2015 Dec 22 -" For version 5.x: Clear all syntax items -" For version 6.x and 7.x: Quit when a syntax file was already loaded +" quit when a syntax file was already loaded if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") + if exists("b:current_syntax") finish endif let main_syntax = 'aptconf' diff --git a/runtime/syntax/arduino.vim b/runtime/syntax/arduino.vim index 14299a441a..4a4ef82072 100644 --- a/runtime/syntax/arduino.vim +++ b/runtime/syntax/arduino.vim @@ -10,20 +10,13 @@ " Thanks to Rik, Erik Nomitch, Adam Obeng and Graeme Cross for helpful feedback! -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif " Read the C syntax to start with -if version < 600 - so :p:h/cpp.vim -else - runtime! syntax/cpp.vim -endif +runtime! syntax/cpp.vim syn keyword arduinoConstant HIGH LOW INPUT OUTPUT syn keyword arduinoConstant DEC BIN HEX OCT BYTE diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim index e5f16c5bdc..501f5f0872 100644 --- a/runtime/syntax/asm.vim +++ b/runtime/syntax/asm.vim @@ -7,11 +7,8 @@ " Thanks to Ori Avtalion for feedback on the comment markers! -" For version 5.x: Clear all syntax items -" For version 6.0 and later: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -103,37 +100,29 @@ syn match asmDirective "\.[A-Za-z][0-9A-Za-z-_]*" syn case match " Define the default highlighting. -" 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_asm_syntax_inits") - if version < 508 - let did_asm_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later - HiLink asmSection Special - HiLink asmLabel Label - HiLink asmComment Comment - HiLink asmTodo Todo - HiLink asmDirective Statement - - HiLink asmInclude Include - HiLink asmCond PreCondit - HiLink asmMacro Macro - - HiLink hexNumber Number - HiLink decNumber Number - HiLink octNumber Number - HiLink binNumber Number - - HiLink asmIdentifier Identifier - HiLink asmType Type - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" The default methods for highlighting. Can be overridden later +HiLink asmSection Special +HiLink asmLabel Label +HiLink asmComment Comment +HiLink asmTodo Todo +HiLink asmDirective Statement + +HiLink asmInclude Include +HiLink asmCond PreCondit +HiLink asmMacro Macro + +HiLink hexNumber Number +HiLink decNumber Number +HiLink octNumber Number +HiLink binNumber Number + +HiLink asmIdentifier Identifier +HiLink asmType Type + +delcommand HiLink let b:current_syntax = "asm" diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim index cd23517cad..ace56c854e 100644 --- a/runtime/syntax/asm68k.vim +++ b/runtime/syntax/asm68k.vim @@ -8,11 +8,8 @@ " Feel free to contribute... " -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -328,63 +325,55 @@ syn match asm68kDirective "\= 508 || !exists("did_asm68k_syntax_inits") - if version < 508 - let did_asm68k_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later - " Comment Constant Error Identifier PreProc Special Statement Todo Type - " - " Constant Boolean Character Number String - " Identifier Function - " PreProc Define Include Macro PreCondit - " Special Debug Delimiter SpecialChar SpecialComment Tag - " Statement Conditional Exception Keyword Label Operator Repeat - " Type StorageClass Structure Typedef - - HiLink asm68kComment Comment - HiLink asm68kTodo Todo - - HiLink hexNumber Number " Constant - HiLink octNumber Number " Constant - HiLink binNumber Number " Constant - HiLink decNumber Number " Constant - HiLink floatNumber Number " Constant - HiLink floatExponent Number " Constant - HiLink floatE SpecialChar " Statement - "HiLink floatE Number " Constant - - HiLink asm68kImmediate SpecialChar " Statement - "HiLink asm68kSymbol Constant - - HiLink asm68kString String " Constant - HiLink asm68kCharError Error - HiLink asm68kStringError Error - - HiLink asm68kReg Identifier - HiLink asm68kOperator Identifier - - HiLink asm68kInclude Include " PreProc - HiLink asm68kMacro Macro " PreProc - HiLink asm68kMacroParam Keyword " Statement - - HiLink asm68kDirective Special - HiLink asm68kPreCond Special - - - HiLink asm68kOpcode Statement - HiLink asm68kCond Conditional " Statement - HiLink asm68kRepeat Repeat " Statement - - HiLink asm68kLabel Type - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" The default methods for highlighting. Can be overridden later +" Comment Constant Error Identifier PreProc Special Statement Todo Type +" +" Constant Boolean Character Number String +" Identifier Function +" PreProc Define Include Macro PreCondit +" Special Debug Delimiter SpecialChar SpecialComment Tag +" Statement Conditional Exception Keyword Label Operator Repeat +" Type StorageClass Structure Typedef + +HiLink asm68kComment Comment +HiLink asm68kTodo Todo + +HiLink hexNumber Number " Constant +HiLink octNumber Number " Constant +HiLink binNumber Number " Constant +HiLink decNumber Number " Constant +HiLink floatNumber Number " Constant +HiLink floatExponent Number " Constant +HiLink floatE SpecialChar " Statement +"HiLink floatE Number " Constant + +HiLink asm68kImmediate SpecialChar " Statement +"HiLink asm68kSymbol Constant + +HiLink asm68kString String " Constant +HiLink asm68kCharError Error +HiLink asm68kStringError Error + +HiLink asm68kReg Identifier +HiLink asm68kOperator Identifier + +HiLink asm68kInclude Include " PreProc +HiLink asm68kMacro Macro " PreProc +HiLink asm68kMacroParam Keyword " Statement + +HiLink asm68kDirective Special +HiLink asm68kPreCond Special + + +HiLink asm68kOpcode Statement +HiLink asm68kCond Conditional " Statement +HiLink asm68kRepeat Repeat " Statement + +HiLink asm68kLabel Type +delcommand HiLink let b:current_syntax = "asm68k" diff --git a/runtime/syntax/asmh8300.vim b/runtime/syntax/asmh8300.vim index 48699d89c5..5134c512e7 100644 --- a/runtime/syntax/asmh8300.vim +++ b/runtime/syntax/asmh8300.vim @@ -3,11 +3,8 @@ " Maintainer: Kevin Dahlhausen " Last Change: 2002 Sep 19 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -52,33 +49,21 @@ syn case match " Read the general asm syntax -if version < 600 - source :p:h/asm.vim -else - runtime! syntax/asm.vim -endif +runtime! syntax/asm.vim " Define the default highlighting. -" 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_hitachi_syntax_inits") - if version < 508 - let did_hitachi_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link - HiLink asmOpcode Statement - HiLink asmRegister Identifier +HiLink asmOpcode Statement +HiLink asmRegister Identifier - " My default-color overrides: - "hi asmOpcode ctermfg=yellow - "hi asmReg ctermfg=lightmagenta +" My default-color overrides: +"hi asmOpcode ctermfg=yellow +"hi asmReg ctermfg=lightmagenta - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "asmh8300" diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim index 28c8efba95..8b553e884c 100644 --- a/runtime/syntax/asn.vim +++ b/runtime/syntax/asn.vim @@ -4,11 +4,8 @@ " URL: http://www.fleiner.com/vim/syntax/asn.vim " Last Change: 2012 Oct 05 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -50,34 +47,26 @@ syn match asnBraces "[{}]" syn sync ccomment asnComment " Define the default highlighting. -" 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_asn_syn_inits") - if version < 508 - let did_asn_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - HiLink asnDefinition Function - HiLink asnBraces Function - HiLink asnStructure Statement - HiLink asnBoolValue Boolean - HiLink asnSpecial Special - HiLink asnString String - HiLink asnCharacter Character - HiLink asnSpecialCharacter asnSpecial - HiLink asnNumber asnValue - HiLink asnComment Comment - HiLink asnLineComment asnComment - HiLink asnType Type - HiLink asnTypeInfo PreProc - HiLink asnValue Number - HiLink asnExternal Include - HiLink asnTagModifier Function - HiLink asnFieldOption Type - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link +HiLink asnDefinition Function +HiLink asnBraces Function +HiLink asnStructure Statement +HiLink asnBoolValue Boolean +HiLink asnSpecial Special +HiLink asnString String +HiLink asnCharacter Character +HiLink asnSpecialCharacter asnSpecial +HiLink asnNumber asnValue +HiLink asnComment Comment +HiLink asnLineComment asnComment +HiLink asnType Type +HiLink asnTypeInfo PreProc +HiLink asnValue Number +HiLink asnExternal Include +HiLink asnTagModifier Function +HiLink asnFieldOption Type +delcommand HiLink let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/syntax/aspperl.vim b/runtime/syntax/aspperl.vim index 0f7ef46872..5a9abedb19 100644 --- a/runtime/syntax/aspperl.vim +++ b/runtime/syntax/aspperl.vim @@ -4,11 +4,8 @@ " URL: http://nim.dhs.org/~edh/aspperl.vim " Last Change: 2001 May 09 -" 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 -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -16,14 +13,9 @@ if !exists("main_syntax") let main_syntax = 'perlscript' endif -if version < 600 - so :p:h/html.vim - syn include @AspPerlScript :p:h/perl.vim -else - runtime! syntax/html.vim - unlet b:current_syntax - syn include @AspPerlScript syntax/perl.vim -endif +runtime! syntax/html.vim +unlet b:current_syntax +syn include @AspPerlScript syntax/perl.vim syn cluster htmlPreproc add=AspPerlScriptInsideHtmlTags diff --git a/runtime/syntax/aspvbs.vim b/runtime/syntax/aspvbs.vim index f1435cb04b..07273e190b 100644 --- a/runtime/syntax/aspvbs.vim +++ b/runtime/syntax/aspvbs.vim @@ -11,10 +11,8 @@ " Thanks to Dean Hall for testing the use of classes in " VBScripts which I've been too scared to do. -" Quit when a syntax file was already loaded -if version < 600 - syn clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -22,11 +20,7 @@ if !exists("main_syntax") let main_syntax = 'aspvbs' endif -if version < 600 - source :p:h/html.vim -else - runtime! syntax/html.vim -endif +runtime! syntax/html.vim unlet b:current_syntax syn cluster htmlPreProc add=AspVBScriptInsideHtmlTags @@ -163,31 +157,23 @@ syn sync match htmlHighlight grouphere htmlTag "%>" " Define the default highlighting. -" 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_aspvbs_syn_inits") - if version < 508 - let did_aspvbs_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - "HiLink AspVBScript Special - HiLink AspVBSLineNumber Comment - HiLink AspVBSNumber Number - HiLink AspVBSError Error - HiLink AspVBSStatement Statement - HiLink AspVBSString String - HiLink AspVBSComment Comment - HiLink AspVBSTodo Todo - HiLink AspVBSFunction Identifier - HiLink AspVBSMethods PreProc - HiLink AspVBSEvents Special - HiLink AspVBSTypeSpecifier Type - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +"HiLink AspVBScript Special +HiLink AspVBSLineNumber Comment +HiLink AspVBSNumber Number +HiLink AspVBSError Error +HiLink AspVBSStatement Statement +HiLink AspVBSString String +HiLink AspVBSComment Comment +HiLink AspVBSTodo Todo +HiLink AspVBSFunction Identifier +HiLink AspVBSMethods PreProc +HiLink AspVBSEvents Special +HiLink AspVBSTypeSpecifier Type + +delcommand HiLink let b:current_syntax = "aspvbs" diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim index fd4ec39c91..c562b85575 100644 --- a/runtime/syntax/asterisk.vim +++ b/runtime/syntax/asterisk.vim @@ -5,10 +5,9 @@ " Updated for 1.2 by Tilghman Lesher (Corydon76) " Last Change: 2015 Feb 27 " version 0.4 -" -if version < 600 - syntax clear -elseif exists("b:current_syntax") + +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -57,42 +56,35 @@ syn match asteriskSetting "^port\s*=\s*\d\{1,5}\s*$" contains=aste syn match asteriskSetting "^host\s*=\s*\(dynamic\|\(\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)\|\([[:alnum:]][[:alnum:]\-\.]*\.[[:alpha:]]{2,10}\)\)" contains=asteriskIP,asteriskHostname " Define the default highlighting. -" 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_conf_syntax_inits") - if version < 508 - let did_conf_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink asteriskComment Comment +HiLink asteriskExten String +HiLink asteriskContext Preproc +HiLink asteriskPattern Type +HiLink asteriskApp Statement +HiLink asteriskInclude Preproc +HiLink asteriskIncludeBad Error +HiLink asteriskPriority Preproc +HiLink asteriskLabel Type +HiLink asteriskVar String +HiLink asteriskVarLen Function +HiLink asteriskExp Type +HiLink asteriskCodecsPermit Preproc +HiLink asteriskCodecs String +HiLink asteriskType Statement +HiLink asteriskTypeType Type +HiLink asteriskAuth String +HiLink asteriskAuthType Type +HiLink asteriskIPRange Identifier +HiLink asteriskIP Identifier +HiLink asteriskPort Identifier +HiLink asteriskHostname Identifier +HiLink asteriskSetting Statement +HiLink asteriskError Error +delcommand HiLink - HiLink asteriskComment Comment - HiLink asteriskExten String - HiLink asteriskContext Preproc - HiLink asteriskPattern Type - HiLink asteriskApp Statement - HiLink asteriskInclude Preproc - HiLink asteriskIn