From 6126e1c97637338e86b581d77425c41343bcf28f Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Tue, 14 Oct 2025 16:47:54 +0200 Subject: [PATCH] vim: properly handle newlines in patterns --- vim/werge.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/werge.vim b/vim/werge.vim index 0997437..df5277f 100644 --- a/vim/werge.vim +++ b/vim/werge.vim @@ -13,8 +13,8 @@ endif " syntax for the werge files syntax region wergeHunk start=/<<<<>>>>/ contains=wergeRm,wergeDiffAdd,wergeConflictOrigAdd syntax region wergeRm start=/<<<<=]\|>\{1,4\}>\@!\|=\{1,4\}=\@!\)*>>>>>/ms=s+5,me=e-5 contained -syntax match wergeConflictOrigAdd /|||||\([^=>]\|=\{1,4\}=\@!\|>\{1,4\}>\@!\)*=====\([^=>]\|=\{1,4\}=\@!\|>\{1,4\}>\@!\)*>>>>>/me=e-5 contained contains=wergeConflictOrig,wergeconflictAdd +syntax match wergeDiffAdd /|||||\(\_[^>=]\|>\{1,4\}>\@!\|=\{1,4\}=\@!\)*>>>>>/ms=s+5,me=e-5 contained +syntax match wergeConflictOrigAdd /|||||\(\_[^=>]\|=\{1,4\}=\@!\|>\{1,4\}>\@!\)*=====\(\_[^=>]\|=\{1,4\}=\@!\|>\{1,4\}>\@!\)*>>>>>/me=e-5 contained contains=wergeConflictOrig,wergeconflictAdd syntax region wergeConflictOrig start=/|||||/hs=e+1 end=/=====/he=s-1,me=s-1 contained syntax region wergeConflictAdd start=/=====/hs=e+1 end=/>>>>>/he=s-1,me=s-1 contained