From 47b4eb110da8dfab1fca51ce4cc68b224d85b966 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 16:45:37 +0200 Subject: vim-patch:4c92e75dd4dd Update runtime files. https://github.com/vim/vim/commit/4c92e75dd4ddb68dd92a86dd02d53c70dd4af33a vim-patch:c854898881c0 Revert change accidentally included in runtime file updates. Closes vim/vim#3998. https://github.com/vim/vim/commit/c854898881c02259f90170f210bf65bbd20cc1fc --- runtime/syntax/make.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'runtime/syntax/make.vim') diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim index 7072bab988..16e66bc8f2 100644 --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -1,8 +1,9 @@ " Vim syntax file " Language: Makefile -" Maintainer: Claudio Fleiner -" URL: http://www.fleiner.com/vim/syntax/make.vim -" Last Change: 2015 Feb 28 +" Maintainer: Roland Hieber +" Previous Maintainer: Claudio Fleiner +" URL: https://github.com/vim/vim/syntax/make.vim +" Last Change: 2019 Feb 08 " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -64,7 +65,7 @@ syn match makeCmdNextLine "\\\n."he=e-1 contained " Statements / Functions (GNU make) -syn match makeStatement contained "(\(subst\|abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1 +syn match makeStatement contained "(\(abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|file\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|guile\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|subst\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1 " Comment if exists("make_microsoft") -- cgit From 31a5ec23ebef511ca89f7d24077e7a5624ed4c6e Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 22:48:52 +0200 Subject: vim-patch:723dd946f948 Update runtime files. https://github.com/vim/vim/commit/723dd946f94856be94a943876945fb1bd8169059 --- runtime/syntax/make.vim | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'runtime/syntax/make.vim') diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim index 16e66bc8f2..377e4450d9 100644 --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -3,7 +3,7 @@ " Maintainer: Roland Hieber " Previous Maintainer: Claudio Fleiner " URL: https://github.com/vim/vim/syntax/make.vim -" Last Change: 2019 Feb 08 +" Last Change: 2019 Apr 02 " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -19,7 +19,7 @@ syn match makeSpecial "^\s*[@+-]\+" syn match makeNextLine "\\\n\s*" " some directives -syn match makePreCondit "^ *\(ifeq\>\|else\>\|endif\>\|ifneq\>\|ifdef\>\|ifndef\>\)" +syn match makePreCondit "^ *\(ifn\=\(eq\|def\)\>\|else\(\s\+ifn\=\(eq\|def\)\)\=\>\|endif\>\)" syn match makeInclude "^ *[-s]\=include" syn match makeStatement "^ *vpath" syn match makeExport "^ *\(export\|unexport\)\>" @@ -32,8 +32,8 @@ syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains " Microsoft Makefile specials syn case ignore -syn match makeInclude "^! *include" -syn match makePreCondit "! *\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|elseif\|else if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>" +syn match makeInclude "^!\s*include" +syn match makePreCondit "^!\s*\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|else\s*if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>" syn case match " identifiers @@ -101,17 +101,17 @@ syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Z " Define the default highlighting. " Only when an item doesn't have highlighting yet -hi def link makeNextLine makeSpecial +hi def link makeNextLine makeSpecial hi def link makeCmdNextLine makeSpecial -hi def link makeSpecTarget Statement +hi def link makeSpecTarget Statement if !exists("make_no_commands") -hi def link makeCommands Number +hi def link makeCommands Number endif -hi def link makeImplicit Function +hi def link makeImplicit Function hi def link makeTarget Function hi def link makeInclude Include -hi def link makePreCondit PreCondit -hi def link makeStatement Statement +hi def link makePreCondit PreCondit +hi def link makeStatement Statement hi def link makeIdent Identifier hi def link makeSpecial Special hi def link makeComment Comment -- cgit