From 5ad188e14c1f4dd4b06b04b783e7918b4e1b3834 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Mon, 21 May 2018 22:14:43 +1000
Subject: [PATCH] rc/: Escaping cleanups in bundled scripts

Remove escapes that trigger errors when experimenting with doubling-up
escaping.
---
 rc/base/ctags.kak   | 8 ++++----
 rc/base/haskell.kak | 2 +-
 rc/base/perl.kak    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rc/base/ctags.kak b/rc/base/ctags.kak
index 43392ce6..3dd3e868 100644
--- a/rc/base/ctags.kak
+++ b/rc/base/ctags.kak
@@ -7,19 +7,19 @@ declare-option -docstring "colon separated list of paths to tag files to parse w
     str-list ctagsfiles 'tags'
 
 define-command -params ..1 \
-    -shell-candidates '
+    -shell-candidates %{
         realpath() { ( path=$(readlink "$1"); cd "$(dirname "$1")"; printf "%s/%s\n" "$(pwd -P)" "$(basename "$1")" ) }
-        printf %s\\n "$kak_opt_ctagsfiles" | tr \':\' \'\n\' |
+        printf %s\\n "$kak_opt_ctagsfiles" | tr ':' '\n' |
         while read -r candidate; do
             [ -f "$candidate" ] && realpath "$candidate"
-        done | awk \'!x[$0]++\' | # remove duplicates
+        done | awk '!x[$0]++' | # remove duplicates
         while read -r tags; do
             namecache="${tags%/*}/.kak.${tags##*/}.namecache"
             if [ -z "$(find "$namecache" -prune -newer "$tags")" ]; then
                 cut -f 1 "$tags" | uniq > "$namecache"
             fi
             cat "$namecache"
-        done' \
+        done} \
     -docstring %{ctags-search [<symbol>]: jump to a symbol's definition
 If no symbol is passed then the current selection is used as symbol name} \
     ctags-search \
diff --git a/rc/base/haskell.kak b/rc/base/haskell.kak
index 25c62861..ba30430b 100644
--- a/rc/base/haskell.kak
+++ b/rc/base/haskell.kak
@@ -12,7 +12,7 @@ hook global BufCreate .*[.](hs) %{
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
 add-highlighter shared/ regions -default code haskell \
-    string   '(?<!\'\\)(?<!\')"'            (?<!\\)(\\\\)*" ''   \
+    string   (?<!'\\)(?<!')"                (?<!\\)(\\\\)*" ''   \
     macro   ^\h*?\K#                        (?<!\\)\n       ''   \
     pragma  \{-#                            '#-\}'          \{-  \
     comment \{-                               -\}           \{-  \
diff --git a/rc/base/perl.kak b/rc/base/perl.kak
index b3180be7..5c0a3862 100644
--- a/rc/base/perl.kak
+++ b/rc/base/perl.kak
@@ -12,10 +12,10 @@ hook global BufCreate .*\.p[lm] %{
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
 add-highlighter shared/ regions -default code perl \
-    command '(?<!\$)(?<!\\)`' (?<!\\)(\\\\)*` '' \
-    double_string '(?<!\$)(?<!\\)"' (?<!\\)(\\\\)*" '' \
-    single_string "(?<!\\$)(?<!\\\\)'" (?<!\\)(\\\\)*' '' \
-    comment '(?<!\$)(?<!\\)#' $ ''
+    command       (?<!\$)(?<!\\)`   (?<!\\)(\\\\)*` '' \
+    double_string (?<!\$)(?<!\\)"   (?<!\\)(\\\\)*" '' \
+    single_string (?<!\$)(?<!\\\\)' (?<!\\)(\\\\)*' '' \
+    comment       (?<!\$)(?<!\\)#   $               ''
 
 add-highlighter shared/perl/command fill magenta
 add-highlighter shared/perl/double_string fill string