xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix grep/make.kak with new behaviour for gl/gh

Browse Source
This commit is contained in:
Maxime Coste 2015-06-08 22:33:32 +01:00
parent cf8695cb84
commit 6cb7e20d54
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc/grep.kak
View File

@ -44,7 +44,7 @@ def jump %{
def next -docstring 'Jump to next grep match' %{ def next -docstring 'Jump to next grep match' %{
eval -try-client %opt{jumpclient} %{ eval -try-client %opt{jumpclient} %{
buffer '*grep*' buffer '*grep*'
exec "%opt{_grep_current_line}ggl/^[^:]+:\d+:<ret>" exec "%opt{_grep_current_line}g<a-l>/^[^:]+:\d+:<ret>"
jump jump
} }
} }

8
rc/make.kak
View File

@ -33,13 +33,13 @@ decl str jumpclient
def errjump -docstring 'Jump to error location' %{ def errjump -docstring 'Jump to error location' %{
try %{ try %{
exec gll<a-?> "Entering directory" <ret> exec gl<a-?> "Entering directory" <ret>
exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l
set buffer _make_current_error_line %val{cursor_line} set buffer _make_current_error_line %val{cursor_line}
eval -try-client %opt{jumpclient} "edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information %{%reg{5}}" eval -try-client %opt{jumpclient} "edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information %{%reg{5}}"
try %{ focus %opt{jumpclient} } try %{ focus %opt{jumpclient} }
} catch %{ } catch %{
exec ghgl s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l exec <a-h><a-l> s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l
set buffer _make_current_error_line %val{cursor_line} set buffer _make_current_error_line %val{cursor_line}
eval -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -color Information %{%reg{4}}" eval -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -color Information %{%reg{4}}"
try %{ focus %opt{jumpclient} } try %{ focus %opt{jumpclient} }
@ -49,7 +49,7 @@ def errjump -docstring 'Jump to error location' %{
def errnext -docstring 'Jump to next error' %{ def errnext -docstring 'Jump to next error' %{
eval -try-client %opt{jumpclient} %{ eval -try-client %opt{jumpclient} %{
buffer '*make*' buffer '*make*'
exec "%opt{_make_current_error_line}ggl/[0-9]+: (?:fatal )?error:<ret>" exec "%opt{_make_current_error_line}g<a-l>/[0-9]+: (?:fatal )?error:<ret>"
errjump errjump
} }
} }
@ -57,7 +57,7 @@ def errnext -docstring 'Jump to next error' %{
def errprev -docstring 'Jump to previous error' %{ def errprev -docstring 'Jump to previous error' %{
eval -try-client %opt{jumpclient} %{ eval -try-client %opt{jumpclient} %{
buffer '*make*' buffer '*make*'
exec "%opt{_make_current_error_line}ggh<a-/>[0-9]+: (?:fatal )?error:<ret>" exec "%opt{_make_current_error_line}g<a-h><a-/>[0-9]+: (?:fatal )?error:<ret>"
errjump errjump
} }
} }