Merge branch 'make/error-pattern' of git://github.com/pauldub/kakoune

1 files changed, 4 insertions, 2 deletions

diff --git a/rc/core/make.kak b/rc/core/make.kak
index f53cb272..c446eb09 100644
--- a/rc/core/make.kak
+++ b/rc/core/make.kak
@@ -1,4 +1,6 @@
 decl str makecmd make
+decl str make_error_pattern " (?:fatal )?error:"
+
 decl str toolsclient
 decl -hidden int _make_current_error_line
 
@@ -59,7 +61,7 @@ def -hidden make-jump %{
 def make-next -docstring 'Jump to the next make error' %{
     eval -collapse-jumps -try-client %opt{jumpclient} %{
         buffer '*make*'
-        exec "%opt{_make_current_error_line}g<a-l>/[0-9]+: (?:fatal )?error:<ret>"
+        exec "%opt{_make_current_error_line}g<a-l>/(?:\w:)?[^:]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>"
         make-jump
     }
     try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } }
@@ -68,7 +70,7 @@ def make-next -docstring 'Jump to the next make error' %{
 def make-prev -docstring 'Jump to the previous make error' %{
     eval -collapse-jumps -try-client %opt{jumpclient} %{
         buffer '*make*'
-        exec "%opt{_make_current_error_line}g<a-h><a-/>[0-9]+: (?:fatal )?error:<ret>"
+        exec "%opt{_make_current_error_line}g<a-h><a-/>(?:\w:)?[^:]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>"
         make-jump
     }
     try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } }