From 89956b5347c84d4d740040ec76298a691beac591 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 2 Aug 2014 09:54:28 +0100 Subject: [PATCH] make.kak: Make column optional. --- rc/make.kak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rc/make.kak b/rc/make.kak index 9d606a63..aaf2f4f4 100644 --- a/rc/make.kak +++ b/rc/make.kak @@ -16,8 +16,8 @@ def -shell-params make %{ %sh{ }} addhl -group / group make -addhl -group /make regex "^([^:\n]+):(\d+):(\d+):\h+(?:((?:fatal )?error)|(warning)|(note)|(required from(?: here)?))?.*?$" 1:cyan 2:green 3:green 4:red 5:yellow 6:blue 7:yellow -addhl -group /make line_option _make_current_error_line default,blue +addhl -group /make regex "^([^:\n]+):(\d+):(?:(\d+):)?\h+(?:((?:fatal )?error)|(warning)|(note)|(required from(?: here)?))?.*?$" 1:cyan 2:green 3:green 4:red 5:yellow 6:blue 7:yellow +addhl -group /make line_option _make_current_error_line default,rgb:606060 hook global WinSetOption filetype=make %{ addhl ref make @@ -31,12 +31,12 @@ decl str jumpclient def errjump -docstring 'Jump to error location' %{ try %{ exec gll "Entering directory" - exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(\d+):([^\n]+)\'" l + exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" l set buffer _make_current_error_line %val{cursor_line} eval -try-client %opt{jumpclient} %rec{edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information '%reg{5}'} try %{ focus %opt{jumpclient} } } catch %{ - exec ghgl s "([^:]+):(\d+):(\d+):([^\n]+)\'" l + exec ghgl s "([^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" l set buffer _make_current_error_line %val{cursor_line} eval -try-client %opt{jumpclient} %rec{edit -existing %reg{1} %reg{2} %reg{3}; echo -color Information '%reg{4}'} try %{ focus %opt{jumpclient} }