027_all_vim-7.0-automake-substitutions-93378.patch

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