diff --git a/rc/core/make.kak b/rc/core/make.kak index 76d77b0c..c446eb09 100644 --- a/rc/core/make.kak +++ b/rc/core/make.kak @@ -1,5 +1,5 @@ decl str makecmd make -decl str make_error_pattern "[0-9]+: (?:fatal )?error:" +decl str make_error_pattern " (?:fatal )?error:" decl str toolsclient decl -hidden int _make_current_error_line @@ -61,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/%opt{make_error_pattern}" + exec "%opt{_make_current_error_line}g/(?:\w:)?[^:]+:\d+:(?:\d+:)?%opt{make_error_pattern}" make-jump } try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } } @@ -70,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%opt{make_error_pattern}" + exec "%opt{_make_current_error_line}g(?:\w:)?[^:]+:\d+:(?:\d+:)?%opt{make_error_pattern}" make-jump } try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } }