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

This commit is contained in:
Maxime Coste 2016-12-08 23:02:11 +00:00
commit 5caa969947

View File

@ -1,4 +1,6 @@
decl str makecmd make decl str makecmd make
decl str make_error_pattern " (?:fatal )?error:"
decl str toolsclient decl str toolsclient
decl -hidden int _make_current_error_line 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' %{ def make-next -docstring 'Jump to the next make error' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{ eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*make*' 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 make-jump
} }
try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } } 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' %{ def make-prev -docstring 'Jump to the previous make error' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{ eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*make*' 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 make-jump
} }
try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } } try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } }