diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-03 16:49:30 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-03 16:49:30 +0300 |
| commit | c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57 (patch) | |
| tree | b7e59c416d1435725c65f8952b6e55c70544d97e /runtime/syntax/automake.vim | |
| parent | 62108c3b0be46936c83f6d4c98b44ceb5e6f77fd (diff) | |
| parent | 27a577586eace687c47e7398845178208cae524a (diff) | |
| download | rneovim-c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57.tar.gz rneovim-c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57.tar.bz2 rneovim-c49e22d3964d6c7ae1c24e8ad01b5fec4ca40b57.zip | |
Merge branch 'master' into s-dash-stdin
Diffstat (limited to 'runtime/syntax/automake.vim')
| -rw-r--r-- | runtime/syntax/automake.vim | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim index eea2a9f38c..2a215a9e04 100644 --- a/runtime/syntax/automake.vim +++ b/runtime/syntax/automake.vim @@ -18,18 +18,12 @@ " EXTRA_SOURCES. " Standard syntax initialization -if version < 600 - syntax clear -elseif exists("b:current_syntax") +if exists("b:current_syntax") finish endif " Read the Makefile syntax to start with -if version < 600 - source <sfile>:p:h/make.vim -else - runtime! syntax/make.vim -endif +runtime! syntax/make.vim syn match automakePrimary "^\w\+\(_PROGRAMS\|_LIBRARIES\|_LISP\|_PYTHON\|_JAVA\|_SCRIPTS\|_DATA\|_HEADERS\|_MANS\|_TEXINFOS\|_LTLIBRARIES\)\s*\ze+\==" syn match automakePrimary "^TESTS\s*\ze+\=="me=e-1 @@ -59,34 +53,24 @@ syn region automakeMakeSString start=+'+ skip=+\\'+ end=+'+ contains=makeIde syn region automakeMakeBString start=+`+ skip=+\\`+ end=+`+ contains=makeIdent,makeSString,makeDString,makeNextLine,automakeSubstitution " 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_automake_syntax_inits") - if version < 508 - let did_automake_syntax_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif +" Only when an item doesn't have highlighting yet - HiLink automakePrimary Statement - HiLink automakeSecondary Type - HiLink automakeExtra Special - HiLink automakeOptions Special - HiLink automakeClean Special - HiLink automakeSubdirs Statement - HiLink automakeConditional PreProc - HiLink automakeSubst PreProc - HiLink automakeComment1 makeComment - HiLink automakeComment2 makeComment - HiLink automakeMakeError makeError - HiLink automakeBadSubst makeError - HiLink automakeMakeDString makeDString - HiLink automakeMakeSString makeSString - HiLink automakeMakeBString makeBString +hi def link automakePrimary Statement +hi def link automakeSecondary Type +hi def link automakeExtra Special +hi def link automakeOptions Special +hi def link automakeClean Special +hi def link automakeSubdirs Statement +hi def link automakeConditional PreProc +hi def link automakeSubst PreProc +hi def link automakeComment1 makeComment +hi def link automakeComment2 makeComment +hi def link automakeMakeError makeError +hi def link automakeBadSubst makeError +hi def link automakeMakeDString makeDString +hi def link automakeMakeSString makeSString +hi def link automakeMakeBString makeBString - delcommand HiLink -endif let b:current_syntax = "automake" |