From 58ab144865bed49bd8b34a2e65a190bf81223c1b Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Mon, 4 Feb 2019 12:23:57 -0500
Subject: [PATCH] Use indentwidth for lisp, scheme, and Clojure

---
 rc/base/clojure.kak |  5 +++--
 rc/base/lisp.kak    | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/rc/base/clojure.kak b/rc/base/clojure.kak
index 451c13f59..da6134a65 100644
--- a/rc/base/clojure.kak
+++ b/rc/base/clojure.kak
@@ -179,8 +179,9 @@ define-command -hidden clojure-indent-on-new-line %{
             execute-keys -draft '[bl"i<a-Z><gt>"wZ'
 
             try %{
-                # If a special form, indent another space
-                execute-keys -draft '"wze<a-k>\A' %opt{clojure_special_indent_forms} '\z<ret><a-L>s.\K.*<ret><a-;>;"i<a-Z><gt>'
+                # If a special form, indent another (indentwidth - 1) spaces
+                execute-keys -draft '"wze<a-k>\A' %opt{clojure_special_indent_forms} '\z<ret>'
+                execute-keys -draft '"wze<a-L>s.{' %sh{printf $(( kak_opt_indentwidth - 1 ))} '}\K.*<ret><a-;>;"i<a-Z><gt>'
             } catch %{
                 # If not special and parameter appears on line 1, indent to parameter
                 execute-keys -draft '"wze<a-l>s\h\K[^\s].*<ret><a-;>;"i<a-Z><gt>'
diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak
index d0ab1d197..378bb3c52 100644
--- a/rc/base/lisp.kak
+++ b/rc/base/lisp.kak
@@ -43,10 +43,14 @@ define-command -hidden lisp-indent-on-new-line %{
         try %{
             execute-keys -draft '[bl"i<a-Z><gt>"wZ'
 
-            try %{ execute-keys -draft '"wz<a-l>s.\K.*<ret><a-;>;"i<a-Z><gt>' }
-
-            # If not "special" form and parameter appears on line 1, indent to parameter
-            execute-keys -draft '"wze<a-K>\A' %opt{lisp_special_indent_forms} '\z<ret>' '<a-l>s\h\K[^\s].*<ret><a-;>;"i<a-Z><gt>'
+            try %{
+                # If a special form, indent another (indentwidth - 1) spaces
+                execute-keys -draft '"wze<a-k>\A' %opt{lisp_special_indent_forms} '\z<ret>'
+                execute-keys -draft '"wze<a-L>s.{' %sh{printf $(( kak_opt_indentwidth - 1 ))} '}\K.*<ret><a-;>;"i<a-Z><gt>'
+            } catch %{
+                # If not "special" form and parameter appears on line 1, indent to parameter
+                execute-keys -draft '"wze<a-l>s\h\K[^\s].*<ret><a-;>;"i<a-Z><gt>'
+            }
         }
         try %{ execute-keys -draft '[rl"i<a-Z><gt>' }
         try %{ execute-keys -draft '[Bl"i<a-Z><gt>' }