From: Yiyang Wu Date: Sat, 25 Oct 2025 14:19:07 +0000 (+0000) Subject: runtime(make): Prevent makeTargetinDefine matching extra line X-Git-Tag: v9.1.1872~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7193cab6c88a6d81c9f302bf7f97810765e6d2be;p=thirdparty%2Fvim.git runtime(make): Prevent makeTargetinDefine matching extra line This fixes a bug introduced in 2a33b499a3d7f46dc307234847a6562cef6cf1d8: When makeTargetinDefine ends with makeIdent, makeSpecTarget or makeComment, the following line is also matched as makeTargetinDefine. So, add keepend to prevent that just as makeTarget does. related: #18403 closes: #18570 Signed-off-by: Yiyang Wu Signed-off-by: Roland Hieber Signed-off-by: Christian Brabandt --- diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim index 8b6f04cbcf..338150fa94 100644 --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -6,6 +6,7 @@ " Last Change: 2022 Nov 06 " 2025 Apr 15 by Vim project: rework Make flavor detection (#17089) " 2025 Oct 12 by Vim project: update makeDefine highlighting (#18403) +" 2025 Oct 25 by Vim project: update makeTargetinDefine highlighting (#18570) " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -65,6 +66,7 @@ syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 syn region makeTargetinDefine transparent matchgroup=makeTargetinDefine \ start="^[~A-Za-z0-9_./$(){}%-][A-Za-z0-9_./\t ${}()%-]*&\?:\?:\{1,2}[^:=]"rs=e-1 \ end="[^\\]$" + \ keepend syn match makeTargetinDefine "^[~A-Za-z0-9_./$(){}%*@-][A-Za-z0-9_./\t $(){}%*@-]*&\?::\=\s*$" \ contains=makeIdent,makeSpecTarget,makeComment