From 5a52a7ae7dae7ffab8d1dd3631951988fff7ab8a Mon Sep 17 00:00:00 2001
From: matze-dd <45763831+matze-dd@users.noreply.github.com>
Date: Tue, 17 Nov 2020 14:33:01 +0100
Subject: [PATCH 1/2] vlty: ensure compatibility with vim-dispatch

---
 compiler/vlty.vim | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/vlty.vim b/compiler/vlty.vim
index c8fe0a927e..cb346b818a 100644
--- a/compiler/vlty.vim
+++ b/compiler/vlty.vim
@@ -77,9 +77,15 @@ silent CompilerSet makeprg
 
 let &l:errorformat = '%I=== %f ===,%C%*\d.) Line %l\, column %v\, Rule ID:%.%#,'
 if s:vlty.show_suggestions == 0
-  let &l:errorformat .= '%ZMessage: %m,%-G%.%#'
+  let &l:errorformat .= '%CMessage: %m,'
+  " see vimtex issue #1854: properly consume all message lines,
+  " otherwise problems with plugin vim-dispatch
+  let &l:errorformat .= '%C%.%#,%C%.%#,%C%.%#,%Z,'
+  let &l:errorformat .= '%-G=== %.%#'
 else
-  let &l:errorformat .= '%CMessage: %m,%Z%m,%-G%.%#'
+  let &l:errorformat .= '%CMessage: %m,%+CSuggestion:%m,'
+  let &l:errorformat .= '%C%.%#,%C%.%#,%Z,'
+  let &l:errorformat .= '%-G=== %.%#'
 endif
 silent CompilerSet errorformat
 

From 98eac6348b62e70b8e339f6730eb4923b8064a19 Mon Sep 17 00:00:00 2001
From: matze-dd <45763831+matze-dd@users.noreply.github.com>
Date: Fri, 20 Nov 2020 11:01:53 +0100
Subject: [PATCH 2/2] vlty: ensure compatibility with vim-dispatch

---
 compiler/vlty.vim | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/compiler/vlty.vim b/compiler/vlty.vim
index cb346b818a..3737346618 100644
--- a/compiler/vlty.vim
+++ b/compiler/vlty.vim
@@ -77,15 +77,11 @@ silent CompilerSet makeprg
 
 let &l:errorformat = '%I=== %f ===,%C%*\d.) Line %l\, column %v\, Rule ID:%.%#,'
 if s:vlty.show_suggestions == 0
-  let &l:errorformat .= '%CMessage: %m,'
-  " see vimtex issue #1854: properly consume all message lines,
-  " otherwise problems with plugin vim-dispatch
-  let &l:errorformat .= '%C%.%#,%C%.%#,%C%.%#,%Z,'
-  let &l:errorformat .= '%-G=== %.%#'
+  " final duplicated '%-G%.%#': compatibility with vim-dispatch;
+  " see issue #199 of vim-dispatch and issue #1854 of vimtex
+  let &l:errorformat .= '%ZMessage: %m,%-G%.%#,%-G%.%#'
 else
-  let &l:errorformat .= '%CMessage: %m,%+CSuggestion:%m,'
-  let &l:errorformat .= '%C%.%#,%C%.%#,%Z,'
-  let &l:errorformat .= '%-G=== %.%#'
+  let &l:errorformat .= '%CMessage: %m,%Z%m,%-G%.%#,%-G%.%#'
 endif
 silent CompilerSet errorformat