From 80d661e6a70a8e03ba8e1ee0e0ae8c3de5b8da03 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Fri, 29 Sep 2017 10:39:59 +0800
Subject: [PATCH] rc/: More consistent uses of regex syntax

Always use \A \z for subject start/end, always \b for word boundaries
---
 rc/base/autowrap.kak   |  2 +-
 rc/base/css.kak        |  2 +-
 rc/base/d.kak          |  8 ++++----
 rc/base/fish.kak       |  6 +++---
 rc/base/go.kak         |  8 ++++----
 rc/base/haskell.kak    |  2 +-
 rc/base/html.kak       |  2 +-
 rc/base/java.kak       |  8 ++++----
 rc/base/javascript.kak |  2 +-
 rc/base/json.kak       |  2 +-
 rc/base/lisp.kak       |  2 +-
 rc/base/lua.kak        |  4 ++--
 rc/base/perl.kak       |  8 ++++----
 rc/base/ruby.kak       |  8 ++++----
 rc/base/rust.kak       |  6 +++---
 rc/base/scala.kak      |  2 +-
 rc/base/swift.kak      | 20 ++++++++++----------
 rc/core/c-family.kak   | 12 ++++++------
 rc/core/doc.kak        |  2 +-
 rc/core/make.kak       |  4 ++--
 rc/extra/cabal.kak     |  4 ++--
 rc/extra/clang.kak     |  4 ++--
 rc/extra/elm.kak       |  2 +-
 rc/extra/hbs.kak       | 12 ++++++------
 rc/extra/jedi.kak      |  2 +-
 rc/extra/kickstart.kak |  4 ++--
 rc/extra/modeline.kak  |  2 +-
 rc/extra/moon.kak      |  6 +++---
 rc/extra/php.kak       |  2 +-
 rc/extra/ragel.kak     |  4 ++--
 rc/extra/tupfile.kak   |  2 +-
 31 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/rc/base/autowrap.kak b/rc/base/autowrap.kak
index 77f507c84..d723c93ed 100644
--- a/rc/base/autowrap.kak
+++ b/rc/base/autowrap.kak
@@ -17,7 +17,7 @@ def -hidden autowrap-cursor %{ eval -save-regs '/"|^@m' %{
             reg m "%val{selections_desc}"
 
             ## if we're adding characters past the limit, just wrap them around
-            exec -draft "<a-h><a-k>.{%opt{autowrap_column}}\h*[^\s]*<ret>1s(\h+)[^\h]*\'<ret>c<ret>"
+            exec -draft "<a-h><a-k>.{%opt{autowrap_column}}\h*[^\s]*<ret>1s(\h+)[^\h]*\z<ret>c<ret>"
         } catch %{
             ## if we're adding characters in the middle of a sentence, use
             ## the `fmtcmd` command to wrap the entire paragraph
diff --git a/rc/base/css.kak b/rc/base/css.kak
index 095835de2..391400ca4 100644
--- a/rc/base/css.kak
+++ b/rc/base/css.kak
@@ -57,7 +57,7 @@ def -hidden css-indent-on-new-line %[
 def -hidden css-indent-on-closing-curly-brace %[
     eval -draft -itersel %[
         # align to opening curly brace when alone on a line
-        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> m s \`|.\' <ret> 1<a-&> ]
+        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> m s \A|.\z <ret> 1<a-&> ]
     ]
 ]
 
diff --git a/rc/base/d.kak b/rc/base/d.kak
index 92fbd64fa..b4a1264e3 100644
--- a/rc/base/d.kak
+++ b/rc/base/d.kak
@@ -90,24 +90,24 @@ def -hidden d-indent-on-new-line %~
         # cleanup trailing white spaces on the previous line
         try %{ exec -draft k<a-x> s \h+$ <ret>d }
         # align to opening paren of previous line
-        try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> s \`\(\h*.|.\' <ret> '<a-;>' & }
+        try %{ exec -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> '<a-;>' & }
         # copy // comments prefix
         try %{ exec -draft \;<c-s>k<a-x> s ^\h*\K/{2,} <ret> y<c-o><c-o>P<esc> }
         # indent after a switch's case/default statements
         try %[ exec -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ]
         # indent after if|else|while|for
-        try %[ exec -draft \;<a-F>)MB <a-k> \`(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\' <ret> s \`|.\' <ret> 1<a-&>1<a-space><a-gt> ]
+        try %[ exec -draft \;<a-F>)MB <a-k> \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ]
     =
 ~
 
 def -hidden d-indent-on-opening-curly-brace %[
     # align indent with opening paren when { is entered on a new line after the closing paren
-    try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+    try %[ exec -draft -itersel h<a-F>)M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
 ]
 
 def -hidden d-indent-on-closing-curly-brace %[
     # align to opening curly brace when alone on a line
-    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
+    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
 ]
 
 # Initialization
diff --git a/rc/base/fish.kak b/rc/base/fish.kak
index a417b1ea9..626d2199b 100644
--- a/rc/base/fish.kak
+++ b/rc/base/fish.kak
@@ -39,9 +39,9 @@ def -hidden fish-filter-around-selections %{
 def -hidden fish-indent-on-char %{
     eval -no-hooks -draft -itersel %{
         # align middle and end structures to start and indent when necessary
-        try %{ exec -draft <a-x><a-k>^\h*(else)$<ret><a-\;><a-?>^\h*(if)<ret>s\A|\Z<ret>'<a-&> }
-        try %{ exec -draft <a-x><a-k>^\h*(end)$<ret><a-\;><a-?>^\h*(begin|for|function|if|switch|while)<ret>s\A|\Z<ret>'<a-&> }
-        try %{ exec -draft <a-x><a-k>^\h*(case)$<ret><a-\;><a-?>^\h*(switch)<ret>s\A|\Z<ret>'<a-&>'<space><a-gt> }
+        try %{ exec -draft <a-x><a-k>^\h*(else)$<ret><a-\;><a-?>^\h*(if)<ret>s\A|\z<ret>'<a-&> }
+        try %{ exec -draft <a-x><a-k>^\h*(end)$<ret><a-\;><a-?>^\h*(begin|for|function|if|switch|while)<ret>s\A|\z<ret>'<a-&> }
+        try %{ exec -draft <a-x><a-k>^\h*(case)$<ret><a-\;><a-?>^\h*(switch)<ret>s\A|\z<ret>'<a-&>'<space><a-gt> }
     }
 }
 
diff --git a/rc/base/go.kak b/rc/base/go.kak
index b726d1059..a6089563d 100644
--- a/rc/base/go.kak
+++ b/rc/base/go.kak
@@ -62,24 +62,24 @@ def -hidden go-indent-on-new-line %~
         # cleanup trailing white spaces on the previous line
         try %{ exec -draft k<a-x> s \h+$ <ret>d }
         # align to opening paren of previous line
-        try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> s \`\(\h*.|.\' <ret> '<a-;>' & }
+        try %{ exec -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> '<a-;>' & }
         # copy // comments prefix
         try %{ exec -draft \;<c-s>k<a-x> s ^\h*\K/{2,} <ret> y<c-o><c-o>P<esc> }
         # indent after a switch's case/default statements
         try %[ exec -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ]
         # indent after if|else|while|for
-        try %[ exec -draft \;<a-F>)MB <a-k> \`(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\' <ret> s \`|.\' <ret> 1<a-&>1<a-space><a-gt> ]
+        try %[ exec -draft \;<a-F>)MB <a-k> \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ]
     =
 ~
 
 def -hidden go-indent-on-opening-curly-brace %[
     # align indent with opening paren when { is entered on a new line after the closing paren
-    try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+    try %[ exec -draft -itersel h<a-F>)M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
 ]
 
 def -hidden go-indent-on-closing-curly-brace %[
     # align to opening curly brace when alone on a line
-    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
+    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
 ]
 
 # Initialization
diff --git a/rc/base/haskell.kak b/rc/base/haskell.kak
index 84ff0460a..f3a7abefb 100644
--- a/rc/base/haskell.kak
+++ b/rc/base/haskell.kak
@@ -85,7 +85,7 @@ def -hidden haskell-indent-on-new-line %{
         # preserve previous line indent
         try %{ exec -draft \; K <a-&> }
         # align to first clause
-        try %{ exec -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|do|let|where)\h+\K.* <ret> s \`|.\' <ret> & }
+        try %{ exec -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|do|let|where)\h+\K.* <ret> s \A|.\z <ret> & }
         # filter previous line
         try %{ exec -draft k : haskell-filter-around-selections <ret> }
         # indent after lines beginning with condition or ending with expression or =(
diff --git a/rc/base/html.kak b/rc/base/html.kak
index 4b7380f03..385b26676 100644
--- a/rc/base/html.kak
+++ b/rc/base/html.kak
@@ -47,7 +47,7 @@ def -hidden html-filter-around-selections %{
 def -hidden html-indent-on-char %{
     eval -draft -itersel %{
         # align closing tag to opening when alone on a line
-        try %{ exec -draft <space> <a-h> s ^\h+</(\w+)>$ <ret> <a-\;> <a-?> <lt><c-r>1 <ret> s \`|.\' <ret> <a-r> 1<a-&> }
+        try %{ exec -draft <space> <a-h> s ^\h+</(\w+)>$ <ret> <a-\;> <a-?> <lt><c-r>1 <ret> s \A|.\z <ret> <a-r> 1<a-&> }
     }
 }
 
diff --git a/rc/base/java.kak b/rc/base/java.kak
index 8e835fffe..c8485b100 100644
--- a/rc/base/java.kak
+++ b/rc/base/java.kak
@@ -27,24 +27,24 @@ def -hidden java-indent-on-new-line %~
         # cleanup trailing white spaces on the previous line
         try %{ exec -draft k<a-x> s \h+$ <ret>d }
         # align to opening paren of previous line
-        try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> s \`\(\h*.|.\' <ret> '<a-;>' & }
+        try %{ exec -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> '<a-;>' & }
         # copy // comments prefix
         try %{ exec -draft \;<c-s>k<a-x> s ^\h*\K/{2,} <ret> y<c-o><c-o>P<esc> }
         # indent after a switch's case/default statements
         try %[ exec -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ]
         # indent after keywords
-        try %[ exec -draft \;<a-F>)MB <a-k> \`(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\' <ret> s \`|.\' <ret> 1<a-&>1<a-space><a-gt> ]
+        try %[ exec -draft \;<a-F>)MB <a-k> \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ]
     =
 ~
 
 def -hidden java-indent-on-opening-curly-brace %[
     # align indent with opening paren when { is entered on a new line after the closing paren
-    try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+    try %[ exec -draft -itersel h<a-F>)M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
 ]
 
 def -hidden java-indent-on-closing-curly-brace %[
     # align to opening curly brace when alone on a line
-    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
+    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
 ]
 
 # Initialization
diff --git a/rc/base/javascript.kak b/rc/base/javascript.kak
index b19836942..d14dd2634 100644
--- a/rc/base/javascript.kak
+++ b/rc/base/javascript.kak
@@ -47,7 +47,7 @@ def -hidden javascript-filter-around-selections %{
 def -hidden javascript-indent-on-char %<
     eval -draft -itersel %<
         # align closer token to its opener when alone on a line
-        try %/ exec -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \`|.\' <ret> 1<a-&> /
+        try %/ exec -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \A|.\z <ret> 1<a-&> /
     >
 >
 
diff --git a/rc/base/json.kak b/rc/base/json.kak
index c8f2ebc2e..997c612a2 100644
--- a/rc/base/json.kak
+++ b/rc/base/json.kak
@@ -29,7 +29,7 @@ def -hidden json-filter-around-selections %{
 def -hidden json-indent-on-char %<
     eval -draft -itersel %<
         # align closer token to its opener when alone on a line
-        try %< exec -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \`|.\' <ret> 1<a-&> >
+        try %< exec -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \A|.\z <ret> 1<a-&> >
     >
 >
 
diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak
index 745f77ca3..2b806b70e 100644
--- a/rc/base/lisp.kak
+++ b/rc/base/lisp.kak
@@ -36,7 +36,7 @@ def -hidden lisp-indent-on-new-line %{
         # preserve previous line indent
         try %{ exec -draft \; K <a-&> }
         # indent when matches opening paren
-        try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> <a-\;> \; <a-gt> }
+        try %{ exec -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> <a-\;> \; <a-gt> }
     }
 }
 
diff --git a/rc/base/lua.kak b/rc/base/lua.kak
index 5666fc8a1..f37e70394 100644
--- a/rc/base/lua.kak
+++ b/rc/base/lua.kak
@@ -61,8 +61,8 @@ def -hidden lua-filter-around-selections %{
 def -hidden lua-indent-on-char %{
     eval -no-hooks -draft -itersel %{
         # align middle and end structures to start and indent when necessary, elseif is already covered by else
-        try %{ exec -draft <a-x><a-k>^\h*(else)$<ret><a-\;><a-?>^\h*(if)<ret>s\A|\Z<ret>'<a-&> }
-        try %{ exec -draft <a-x><a-k>^\h*(end)$<ret><a-\;><a-?>^\h*(for|function|if|while)<ret>s\A|\Z<ret>'<a-&> }
+        try %{ exec -draft <a-x><a-k>^\h*(else)$<ret><a-\;><a-?>^\h*(if)<ret>s\A|\z<ret>'<a-&> }
+        try %{ exec -draft <a-x><a-k>^\h*(end)$<ret><a-\;><a-?>^\h*(for|function|if|while)<ret>s\A|\z<ret>'<a-&> }
     }
 }
 
diff --git a/rc/base/perl.kak b/rc/base/perl.kak
index fd53a9016..7ba1e14b1 100644
--- a/rc/base/perl.kak
+++ b/rc/base/perl.kak
@@ -79,24 +79,24 @@ def -hidden perl-indent-on-new-line %~
         # cleanup trailing white spaces on the previous line
         try %{ exec -draft k<a-x> s \h+$ <ret>d }
         # align to opening paren of previous line
-        try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> s \`\(\h*.|.\' <ret> '<a-;>' & }
+        try %{ exec -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> '<a-;>' & }
         # copy // comments prefix
         try %{ exec -draft \;<c-s>k<a-x> s ^\h*\K/{2,} <ret> y<c-o><c-o>P<esc> }
         # indent after a switch's case/default statements
         try %[ exec -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ]
         # indent after if|else|while|for
-        try %[ exec -draft \;<a-F>)MB <a-k> \`(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\' <ret> s \`|.\' <ret> 1<a-&>1<a-space><a-gt> ]
+        try %[ exec -draft \;<a-F>)MB <a-k> \A(if|else|while|for)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ]
     =
 ~
 
 def -hidden perl-indent-on-opening-curly-brace %[
     # align indent with opening paren when { is entered on a new line after the closing paren
-    try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+    try %[ exec -draft -itersel h<a-F>)M <a-k> \A\(.*\)\h*\n\h*\{\' <ret> s \A|.\z <ret> 1<a-&> ]
 ]
 
 def -hidden perl-indent-on-closing-curly-brace %[
     # align to opening curly brace when alone on a line
-    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
+    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
 ]
 
 # Initialization
diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak
index 48d006e6e..494385a2c 100644
--- a/rc/base/ruby.kak
+++ b/rc/base/ruby.kak
@@ -111,10 +111,10 @@ def -hidden ruby-filter-around-selections %{
 def -hidden ruby-indent-on-char %{
     eval -no-hooks -draft -itersel %{
         # align middle and end structures to start
-        try %{ exec -draft <a-x> <a-k> ^ \h * (else|elsif) $ <ret> <a-\;> <a-?> ^ \h * (if)                                                       <ret> s \A | \Z <ret> \' <a-&> }
-        try %{ exec -draft <a-x> <a-k> ^ \h * (when)       $ <ret> <a-\;> <a-?> ^ \h * (case)                                                     <ret> s \A | \Z <ret> \' <a-&> }
-        try %{ exec -draft <a-x> <a-k> ^ \h * (rescue)     $ <ret> <a-\;> <a-?> ^ \h * (begin)                                                    <ret> s \A | \Z <ret> \' <a-&> }
-        try %{ exec -draft <a-x> <a-k> ^ \h * (end)        $ <ret> <a-\;> <a-?> ^ \h * (begin|case|class|def|do|for|if|module|unless|until|while) <ret> s \A | \Z <ret> \' <a-&> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (else|elsif) $ <ret> <a-\;> <a-?> ^ \h * (if)                                                       <ret> s \A | \z <ret> \' <a-&> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (when)       $ <ret> <a-\;> <a-?> ^ \h * (case)                                                     <ret> s \A | \z <ret> \' <a-&> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (rescue)     $ <ret> <a-\;> <a-?> ^ \h * (begin)                                                    <ret> s \A | \z <ret> \' <a-&> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (end)        $ <ret> <a-\;> <a-?> ^ \h * (begin|case|class|def|do|for|if|module|unless|until|while) <ret> s \A | \z <ret> \' <a-&> }
     }
 }
 
diff --git a/rc/base/rust.kak b/rc/base/rust.kak
index e352d7e4d..2c641fa06 100644
--- a/rc/base/rust.kak
+++ b/rc/base/rust.kak
@@ -50,21 +50,21 @@ def -hidden rust-indent-on-new-line %~
         # indent after lines ending with { or (
         try %[ exec -draft k <a-x> <a-k> [{(]\h*$ <ret> j <a-gt> ]
         # align to opening paren of previous line
-        try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> s \`\(\h*.|.\' <ret> & }
+        try %{ exec -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> & }
     >
 ~
 
 def -hidden rust-indent-on-opening-curly-brace %[
     eval -draft -itersel %_
         # align indent with opening paren when { is entered on a new line after the closing paren
-        try %[ exec -draft h <a-F> ) M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+        try %[ exec -draft h <a-F> ) M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
     _
 ]
 
 def -hidden rust-indent-on-closing-curly-brace %[
     eval -draft -itersel %_
         # align to opening curly brace when alone on a line
-        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> h m s \`|.\' <ret> 1<a-&> ]
+        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> h m s \A|.\z <ret> 1<a-&> ]
     _
 ]
 
diff --git a/rc/base/scala.kak b/rc/base/scala.kak
index 0aee0a978..92cbc5e81 100644
--- a/rc/base/scala.kak
+++ b/rc/base/scala.kak
@@ -55,7 +55,7 @@ def -hidden scala-indent-on-new-line %[
 def -hidden scala-indent-on-closing-curly-brace %[
     eval -draft -itersel %[
         # align to opening curly brace when alone on a line
-        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> m s \`|.\' <ret> 1<a-&> ]
+        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> m s \A|.\z <ret> 1<a-&> ]
     ]
 ]
 
diff --git a/rc/base/swift.kak b/rc/base/swift.kak
index 5cb2cba3a..91028e61a 100644
--- a/rc/base/swift.kak
+++ b/rc/base/swift.kak
@@ -10,18 +10,18 @@ add-highlighter -group / regions -default code swift \
 add-highlighter -group /swift/string fill string
 add-highlighter -group /swift/comment fill comment
 
-add-highlighter -group /swift/comment regex "\<(TODO|XXX|MARK)\>" 0:red
+add-highlighter -group /swift/comment regex "\b(TODO|XXX|MARK)\b" 0:red
 
-add-highlighter -group /swift/code regex %{\<(true|false|nil)\>|\<-?(?!\$)\d+[fdiu]?|'((\\.)?|[^'\\])'} 0:value
-add-highlighter -group /swift/code regex "\<(let|var|while|in|for|if|else|do|switch|case|default|break|continue|return|try|catch|throw|new|delete|and|or|not|operator|explicit|func|import|return|init|deinit|get|set)\>" 0:keyword
-add-highlighter -group /swift/code regex "\<as\>[!?]?" 0:keyword
-add-highlighter -group /swift/code regex "(\$[0-9])\>" 0:keyword
-add-highlighter -group /swift/code regex "\<(const|mutable|auto|namespace|inline|static|volatile|class|struct|enum|union|public|protected|private|typedef|virtual|friend|extern|typename|override|final|required|convenience|dynamic)\>" 0:attribute
+add-highlighter -group /swift/code regex %{\b(true|false|nil)\b|\b-?(?!\$)\d+[fdiu]?|'((\\.)?|[^'\\])'} 0:value
+add-highlighter -group /swift/code regex "\b(let|var|while|in|for|if|else|do|switch|case|default|break|continue|return|try|catch|throw|new|delete|and|or|not|operator|explicit|func|import|return|init|deinit|get|set)\b" 0:keyword
+add-highlighter -group /swift/code regex "\bas\b[!?]?" 0:keyword
+add-highlighter -group /swift/code regex "(\$[0-9])\b" 0:keyword
+add-highlighter -group /swift/code regex "\b(const|mutable|auto|namespace|inline|static|volatile|class|struct|enum|union|public|protected|private|typedef|virtual|friend|extern|typename|override|final|required|convenience|dynamic)\b" 0:attribute
 
-add-highlighter -group /swift/code regex "\<(self|nil|id|super)\>" 0:value
-add-highlighter -group /swift/code regex "\<(Bool|String|UInt|UInt16|UInt32|UInt64|UInt8)\>" 0:type
-add-highlighter -group /swift/code regex "\<(IBAction|IBOutlet)\>" 0:attribute
-add-highlighter -group /swift/code regex "@\w+\>" 0:attribute
+add-highlighter -group /swift/code regex "\b(self|nil|id|super)\b" 0:value
+add-highlighter -group /swift/code regex "\b(Bool|String|UInt|UInt16|UInt32|UInt64|UInt8)\b" 0:type
+add-highlighter -group /swift/code regex "\b(IBAction|IBOutlet)\b" 0:attribute
+add-highlighter -group /swift/code regex "@\w+\b" 0:attribute
 
 hook -group swift-highlight global WinSetOption filetype=swift %{ add-highlighter ref swift }
 hook -group swift-highlight global WinSetOption filetype=(?!swift).* %{ remove-highlighter swift }
diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index 54b46a660..8f89c3d11 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -32,7 +32,7 @@ def -hidden c-family-indent-on-newline %< eval -draft -itersel %<
     exec \;
     try %<
         # if previous line closed a paren, copy indent of the opening paren line
-        exec -draft k<a-x> 1s(\))(\h+\w+)*\h*(\;\h*)?$<ret> m<a-\;>J s\`|.\'<ret> 1<a-&>
+        exec -draft k<a-x> 1s(\))(\h+\w+)*\h*(\;\h*)?$<ret> m<a-\;>J s\A|.\z<ret> 1<a-&>
     > catch %<
         # else indent new lines with the same level as the previous one
         exec -draft K <a-&>
@@ -51,7 +51,7 @@ def -hidden c-family-indent-on-newline %< eval -draft -itersel %<
         # Go to opening parenthesis and opening brace, then select the most nested one
         try %< try %< exec [bZ<a-\;>[B<a-z><gt> > catch %< exec [B > >
         # Validate selection and get first and last char
-        exec <a-k>\`[{(](\h*\S+)+\n<ret> <a-:><a-\;>L s\`|.\'<ret>
+        exec <a-k>\A[{(](\h*\S+)+\n<ret> <a-:><a-\;>L s\A|.\z<ret>
         # Remove eventual indent from new line
         try %< exec -draft <space> <a-h> s\h+<ret> d >
         # Now align that new line with the opening parenthesis/brace
@@ -61,17 +61,17 @@ def -hidden c-family-indent-on-newline %< eval -draft -itersel %<
 
 def -hidden c-family-indent-on-opening-curly-brace %[
     # align indent with opening paren when { is entered on a new line after the closing paren
-    try %[ exec -draft -itersel h<a-F>)M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+    try %[ exec -draft -itersel h<a-F>)M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
 ]
 
 def -hidden c-family-indent-on-closing-curly-brace %[
     # align to opening curly brace when alone on a line
-    try %[ exec -itersel -draft <a-h><a-:><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
+    try %[ exec -itersel -draft <a-h><a-:><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
 ]
 
 def -hidden c-family-insert-on-closing-curly-brace %[
     # add a semicolon after a closing brace if part of a class, union or struct definition
-    try %[ exec -itersel -draft hm<a-x>B<a-x><a-k>\`\h*(class|struct|union|enum)<ret> a\;<esc> ]
+    try %[ exec -itersel -draft hm<a-x>B<a-x><a-k>\A\h*(class|struct|union|enum)<ret> a\;<esc> ]
 ]
 
 def -hidden c-family-insert-on-newline %[ eval -draft %[
@@ -94,7 +94,7 @@ def -hidden c-family-insert-on-newline %[ eval -draft %[
         exec -draft k<a-x> <a-k>^(\h*/\*|\h+\*(?!/))<ret>
 
         # find comment opening, validate it was not closed, and check its using star prefixes
-        exec -draft <a-?>/\*<ret><a-H> <a-K>\*/<ret> <a-k>\`\h*/\*([^\n]*\n\h*\*)*[^\n]*\n\h*.\'<ret>
+        exec -draft <a-?>/\*<ret><a-H> <a-K>\*/<ret> <a-k>\A\h*/\*([^\n]*\n\h*\*)*[^\n]*\n\h*.\z<ret>
 
         try %[
             # if the previous line is opening the comment, insert star preceeded by space
diff --git a/rc/core/doc.kak b/rc/core/doc.kak
index 5d967f111..84c56c6ea 100644
--- a/rc/core/doc.kak
+++ b/rc/core/doc.kak
@@ -24,7 +24,7 @@ def -hidden -params 1..2 doc-open %{
 
             if [ $# -gt 1 ]; then
                 needle=$(printf %s\\n "$2" | sed 's,<,<lt>,g')
-                printf %s\\n "try %{ exec '%<a-s><a-k>(?i)^\h+[^\n]*?\Q${needle}\E<ret>\'' } catch %{ exec <space>gg }"
+                printf %s\\n "try %{ exec '%<a-s><a-k>(?i)^\h+[^\n]*?\Q${needle}\E<ret>\z' } catch %{ exec <space>gg }"
             fi
         else
            printf %s\\n "echo -markup %{{Error}doc '$@' failed: see *debug* buffer for details}"
diff --git a/rc/core/make.kak b/rc/core/make.kak
index 99eb958ee..6da7f1435 100644
--- a/rc/core/make.kak
+++ b/rc/core/make.kak
@@ -51,11 +51,11 @@ def -hidden make-jump %{
         try %{
             exec gl<a-?> "Entering directory" <ret><a-:>
             # Try to parse the error into capture groups, failing on absolute paths
-            exec s "Entering directory '([^']+)'.*\n([^:/][^:]*):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l
+            exec s "Entering directory '([^']+)'.*\n([^:/][^:]*):(\d+):(?:(\d+):)?([^\n]+)\z" <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 -markup %{{Information}%reg{5}}; try %{ focus }"
         } catch %{
-            exec <a-h><a-l> s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l
+            exec <a-h><a-l> s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\z" <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 -markup %{{Information}%reg{4}}; try %{ focus }"
         }
diff --git a/rc/extra/cabal.kak b/rc/extra/cabal.kak
index 5a64d978a..edbbbde1f 100644
--- a/rc/extra/cabal.kak
+++ b/rc/extra/cabal.kak
@@ -45,14 +45,14 @@ def -hidden cabal-indent-on-new-line %[
 def -hidden cabal-indent-on-opening-curly-brace %[
     eval -draft -itersel %[
         # align indent with opening paren when { is entered on a new line after the closing paren
-        try %[ exec -draft h <a-F> ) M <a-k> \`\(.*\)\h*\n\h*\{\' <ret> s \`|.\' <ret> 1<a-&> ]
+        try %[ exec -draft h <a-F> ) M <a-k> \A\(.*\)\h*\n\h*\{\z <ret> s \A|.\z <ret> 1<a-&> ]
     ]
 ]
 
 def -hidden cabal-indent-on-closing-curly-brace %[
     eval -draft -itersel %[
         # align to opening curly brace when alone on a line
-        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> h m s \`|.\'<ret> 1<a-&> ]
+        try %[ exec -draft <a-h> <a-k> ^\h+\}$ <ret> h m s \A|.\z<ret> 1<a-&> ]
     ]
 ]
 
diff --git a/rc/extra/clang.kak b/rc/extra/clang.kak
index fbc822e15..ba618b471 100644
--- a/rc/extra/clang.kak
+++ b/rc/extra/clang.kak
@@ -105,7 +105,7 @@ def clang-complete -docstring "Complete the current selection" %{ clang-parse -c
 
 def -hidden clang-show-completion-info %[ try %[
     eval -draft %[
-        exec <space>{( <a-k> ^\( <ret> b <a-k> \`\w+\' <ret>
+        exec <space>{( <a-k> ^\( <ret> b <a-k> \A\w+\z <ret>
         %sh[
             desc=$(printf %s\\n "${kak_opt_clang_completions}" | sed -e "{ s/\([^\\]\):/\1\n/g }" | sed -ne "/^${kak_selection}|/ { s/^[^|]\+|//; s/|.*$//; s/\\\:/:/g; p }")
             if [ -n "$desc" ]; then
@@ -118,7 +118,7 @@ def clang-enable-autocomplete -docstring "Enable automatic clang completion" %{
     set window completers "option=clang_completions:%opt{completers}"
     hook window -group clang-autocomplete InsertIdle .* %{
         try %{
-            exec -draft <a-h><a-k>(\.|->|::).\'<ret>
+            exec -draft <a-h><a-k>(\.|->|::).\z<ret>
             echo 'completing...'
             clang-complete
         }
diff --git a/rc/extra/elm.kak b/rc/extra/elm.kak
index aee902014..159131974 100644
--- a/rc/extra/elm.kak
+++ b/rc/extra/elm.kak
@@ -45,7 +45,7 @@ def -hidden elm-indent-on-new-line %{
         # preserve previous line indent
         try %{ exec -draft \; K <a-&> }
         # align to first clause
-        try %{ exec -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|let)\h+\K.* <ret> s \`|.\' <ret> & }
+        try %{ exec -draft \; k x X s ^\h*(if|then|else)?\h*(([\w']+\h+)+=)?\h*(case\h+[\w']+\h+of|let)\h+\K.* <ret> s \A|.\z <ret> & }
         # filter previous line
         try %{ exec -draft k : elm-filter-around-selections <ret> }
         # indent after lines beginning with condition or ending with expression or =(
diff --git a/rc/extra/hbs.kak b/rc/extra/hbs.kak
index b95a18eb7..cf693a1cb 100644
--- a/rc/extra/hbs.kak
+++ b/rc/extra/hbs.kak
@@ -12,19 +12,19 @@ hook global BufCreate .*[.](hbs) %{
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
 add-highlighter -group / regions -default html hbs  \
-    comment          {{!-- --}} '' \
-    comment          {{!   }}   '' \
-    block-expression {{    }}   '' 
+    comment          \{\{!-- --\}\} '' \
+    comment          \{\{!   \}\}   '' \
+    block-expression \{\{    \}\}   '' 
 
 add-highlighter -group /hbs/html ref html
 add-highlighter -group /hbs/comment fill comment
-add-highlighter -group /hbs/block-expression regex {{((#|/|)(\w|-)+) 1:meta
+add-highlighter -group /hbs/block-expression regex \{\{((#|/|)(\w|-)+) 1:meta
 
 # some hbs tags have a special meaning
-add-highlighter -group /hbs/block-expression regex {{((#|/|)(if|else|unless|with|lookup|log)) 1:keyword
+add-highlighter -group /hbs/block-expression regex \{\{((#|/|)(if|else|unless|with|lookup|log)) 1:keyword
 
 # 'each' is special as it really is two words 'each' and 'as'
-add-highlighter -group /hbs/block-expression regex {{((#|/|)((each).*(as))) 2:keyword 4:keyword 5:keyword
+add-highlighter -group /hbs/block-expression regex \{\{((#|/|)((each).*(as))) 2:keyword 4:keyword 5:keyword
 
 add-highlighter -group /hbs/block-expression regex ((\w|-)+)= 1:attribute
 
diff --git a/rc/extra/jedi.kak b/rc/extra/jedi.kak
index 6d39544b7..cf3c35f55 100644
--- a/rc/extra/jedi.kak
+++ b/rc/extra/jedi.kak
@@ -33,7 +33,7 @@ def jedi-complete -docstring "Complete the current selection" %{
 def jedi-enable-autocomplete -docstring "Add jedi completion candidates to the completer" %{
     set window completers "option=jedi_completions:%opt{completers}"
     hook window -group jedi-autocomplete InsertIdle .* %{ try %{
-        exec -draft <a-h><a-k>\..\'<ret>
+        exec -draft <a-h><a-k>\..\z<ret>
         echo 'completing...'
         jedi-complete
     } }
diff --git a/rc/extra/kickstart.kak b/rc/extra/kickstart.kak
index 82bff4fab..7c47c9ca5 100644
--- a/rc/extra/kickstart.kak
+++ b/rc/extra/kickstart.kak
@@ -19,9 +19,9 @@ add-highlighter -group /kickstart/double_string fill string
 add-highlighter -group /kickstart/packages regex "^\h*[\w-]*" 0:value
 add-highlighter -group /kickstart/packages regex "#[^\n]*" 0:comment
 add-highlighter -group /kickstart/packages regex "^\h*@\^?[\h\w-]*" 0:attribute
-add-highlighter -group /kickstart/packages regex '\`\h*\K%packages\b' 0:type
+add-highlighter -group /kickstart/packages regex '\A\h*\K%packages\b' 0:type
 add-highlighter -group /kickstart/packages regex '^\h*%end\b' 0:type
-add-highlighter -group /kickstart/shell regex '\`\h*\K%(pre-install|pre|post)\b' 0:type
+add-highlighter -group /kickstart/shell regex '\A\h*\K%(pre-install|pre|post)\b' 0:type
 add-highlighter -group /kickstart/shell regex '^\h*%end\b' 0:type
 add-highlighter -group /kickstart/shell ref sh
 
diff --git a/rc/extra/modeline.kak b/rc/extra/modeline.kak
index 2902eb776..dc14779a1 100644
--- a/rc/extra/modeline.kak
+++ b/rc/extra/modeline.kak
@@ -95,7 +95,7 @@ def -hidden modeline-parse-impl %{
 #   [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
 def modeline-parse -docstring "Read and interpret vi-format modelines at the beginning/end of the buffer" %{
     try %{ eval -draft %{
-        exec \%s\`|.\'<ret> %opt{modelines}k <a-x> %opt{modelines}X \
+        exec \%s\A|.\z<ret> %opt{modelines}k <a-x> %opt{modelines}X \
              s^\S*?\s+?(vim?|kak(oune)?):\s?[^\n]+<ret> <a-x>
         eval -draft -itersel modeline-parse-impl
     } }
diff --git a/rc/extra/moon.kak b/rc/extra/moon.kak
index 2f63f60aa..08e698afe 100644
--- a/rc/extra/moon.kak
+++ b/rc/extra/moon.kak
@@ -66,11 +66,11 @@ def -hidden moon-filter-around-selections %{
 def -hidden moon-indent-on-char %{
     eval -draft -itersel %{
         # align _else_ statements to start
-        try %{ exec -draft <a-x> <a-k> ^ \h * (else(if)?) $ <ret> <a-\;> <a-?> ^ \h * (if|unless|when) <ret> s \A | \Z <ret> \' <a-&> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (else(if)?) $ <ret> <a-\;> <a-?> ^ \h * (if|unless|when) <ret> s \A | \z <ret> \' <a-&> }
         # align _when_ to _switch_ then indent
-        try %{ exec -draft <a-x> <a-k> ^ \h * (when) $ <ret> <a-\;> <a-?> ^ \h * (switch) <ret> s \A | \Z <ret> \' <a-&> \' <space> <gt> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (when) $ <ret> <a-\;> <a-?> ^ \h * (switch) <ret> s \A | \z <ret> \' <a-&> \' <space> <gt> }
         # align _catch_ and _finally_ to _try_
-        try %{ exec -draft <a-x> <a-k> ^ \h * (catch|finally) $ <ret> <a-\;> <a-?> ^ \h * (try) <ret> s \A | \Z <ret> \' <a-&> }
+        try %{ exec -draft <a-x> <a-k> ^ \h * (catch|finally) $ <ret> <a-\;> <a-?> ^ \h * (try) <ret> s \A | \z <ret> \' <a-&> }
     }
 }
 
diff --git a/rc/extra/php.kak b/rc/extra/php.kak
index f32424417..c317e4730 100644
--- a/rc/extra/php.kak
+++ b/rc/extra/php.kak
@@ -40,7 +40,7 @@ def -hidden php-filter-around-selections %{
 def -hidden php-indent-on-char %<
     eval -draft -itersel %<
         # align closer token to its opener when alone on a line
-        try %/ exec -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \`|.\' <ret> 1<a-&> /
+        try %/ exec -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \A|.\z <ret> 1<a-&> /
     >
 >
 
diff --git a/rc/extra/ragel.kak b/rc/extra/ragel.kak
index 416743afc..e9a0a8682 100644
--- a/rc/extra/ragel.kak
+++ b/rc/extra/ragel.kak
@@ -37,8 +37,8 @@ def -hidden ragel-filter-around-selections %{
 def -hidden ragel-indent-on-char %<
     eval -draft -itersel %<
         # align closer token to its opener when alone on a line
-        try %< exec -draft <a-h> <a-k> ^\h+[]})]$ <ret>        m         s \`|.\' <ret> 1<a-&> >
-        try %< exec -draft <a-h> <a-k> ^\h+  [*]$ <ret> <a-?> [*]$ <ret> s \`|.\' <ret> 1<a-&> >
+        try %< exec -draft <a-h> <a-k> ^\h+[]})]$ <ret>        m         s \A|.\z <ret> 1<a-&> >
+        try %< exec -draft <a-h> <a-k> ^\h+  [*]$ <ret> <a-?> [*]$ <ret> s \A|.\z <ret> 1<a-&> >
     >
 >
 
diff --git a/rc/extra/tupfile.kak b/rc/extra/tupfile.kak
index ce8af71db..931cacaf0 100644
--- a/rc/extra/tupfile.kak
+++ b/rc/extra/tupfile.kak
@@ -23,7 +23,7 @@ add-highlighter -group /tupfile/code regex "\$\([\w_]+\)" 0:value
 add-highlighter -group /tupfile/code regex ":\s*(foreach)\b" 1:keyword
 add-highlighter -group /tupfile/code regex "\.gitignore\b" 0:keyword
 add-highlighter -group /tupfile/code regex "\b(ifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export)\b" 0:keyword
-add-highlighter -group /tupfile/code regex "\b(\&?[\w_]+)\s*[:+]?=" 1:keyword
+add-highlighter -group /tupfile/code regex "\b(&?[\w_]+)\s*[:+]?=" 1:keyword
 
 # Initialization
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾