1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
---
runtime/syntax/automake.vim | 3 +++
runtime/syntax/make.vim | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
index 8a7db7c..cb2b82f 100644
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -53,6 +53,9 @@ syn region automakeMakeSString start=+'+ skip=+\\'+ end=+'+ contains=makeIde
syn region automakeMakeBString start=+`+ skip=+\\`+ end=+`+ contains=makeIdent,makeSString,makeDString,makeNextLine,automakeSubstitution
" Define the default highlighting.
+
+syn cluster makeCommandsContains add=autoMakeSubst,automakeMakeError,automakeBadSubst
+
" Only when an item doesn't have highlighting yet
hi def link automakePrimary Statement
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index 2a64dcd..7325db1 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -62,10 +62,8 @@ syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILEN
\ skipnl nextgroup=makeCommands,makeCommandError
syn match makeCommandError "^\s\+\S.*" contained
-syn region makeCommands contained start=";"hs=s+1 start="^\t"
- \ end="^[^\t#]"me=e-1,re=e-1 end="^$"
- \ contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString
- \ nextgroup=makeCommandError
+syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=@makeCommandsContains nextgroup=makeCommandError
+syn cluster makeCommandsContains add=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString
syn match makeCmdNextLine "\\\n."he=e-1 contained
" some directives
--
2.24.1
|
GitWeb
