From 6cb7e20d54984494d98589213119a9e2accb0317 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Mon, 8 Jun 2015 22:33:32 +0100
Subject: [PATCH] Fix grep/make.kak with new behaviour for gl/gh

---
 rc/grep.kak | 2 +-
 rc/make.kak | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rc/grep.kak b/rc/grep.kak
index 1ef9d98c..d83469b6 100644
--- a/rc/grep.kak
+++ b/rc/grep.kak
@@ -44,7 +44,7 @@ def jump %{
 def next -docstring 'Jump to next grep match' %{
     eval -try-client %opt{jumpclient} %{
         buffer '*grep*'
-        exec "%opt{_grep_current_line}ggl/^[^:]+:\d+:<ret>"
+        exec "%opt{_grep_current_line}g<a-l>/^[^:]+:\d+:<ret>"
         jump
     }
 }
diff --git a/rc/make.kak b/rc/make.kak
index 7de757c9..96f11890 100644
--- a/rc/make.kak
+++ b/rc/make.kak
@@ -33,13 +33,13 @@ decl str jumpclient
 
 def errjump -docstring 'Jump to error location' %{
     try %{
-        exec gll<a-?> "Entering directory" <ret>
+        exec gl<a-?> "Entering directory" <ret>
         exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l
         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}}"
         try %{ focus %opt{jumpclient} }
     } 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}
         eval -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -color Information %{%reg{4}}"
         try %{ focus %opt{jumpclient} }
@@ -49,7 +49,7 @@ def errjump -docstring 'Jump to error location' %{
 def errnext -docstring 'Jump to next error' %{
     eval -try-client %opt{jumpclient} %{
         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
     }
 }
@@ -57,7 +57,7 @@ def errnext -docstring 'Jump to next error' %{
 def errprev -docstring 'Jump to previous error' %{
     eval -try-client %opt{jumpclient} %{
         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
     }
 }