From 8a3f50a8672890a1705c05b9da3cebebf91ea06e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 5 Sep 2021 22:50:21 +1000
Subject: [PATCH] Move +lispindent options to the indent plugin

These can now be appropriately enabled/disabled via
:filetype indent [on|off]
---
 ftplugin/racket.vim | 20 --------------------
 indent/racket.vim   | 24 ++++++++++++++++++++++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 7f0358d..60550e3 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -8,26 +8,6 @@ endif
 let b:did_ftplugin = 1
 
 setl iskeyword+=#,%,^
-setl lispwords+=module,module*,module+,parameterize,let-values,let*-values,letrec-values,local
-setl lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case,syntax-parse
-setl lispwords+=define-signature,unit,unit/sig,compund-unit/sig,define-values/invoke-unit/sig
-setl lispwords+=define-opt/c,define-syntax-rule
-setl lispwords+=struct
-
-" Racket OOP
-setl lispwords+=class,define/public,define/private
-
-" kanren
-setl lispwords+=fresh,run,run*,project,conde,condu
-
-" loops
-setl lispwords+=for,for/list,for/fold,for*,for*/list,for*/fold,for/or,for/and
-setl lispwords+=for/hash,for/sum,for/flvector,for*/flvector,for/vector
-
-setl lispwords+=match,match*,match/values,define/match,match-lambda,match-lambda*,match-lambda**
-setl lispwords+=match-let,match-let*,match-let-values,match-let*-values
-setl lispwords+=match-letrec,match-define,match-define-values
-setl lisp
 
 " Enable auto begin new comment line when continuing from an old comment line
 setl comments=:;;;;,:;;;,:;;,:;
diff --git a/indent/racket.vim b/indent/racket.vim
index 279e185..b6fee09 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -7,6 +7,26 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
-setlocal ai nosi
+setl autoindent lisp nosmartindent
 
-let b:undo_indent = "setl ai< si<"
+setl lispwords+=module,module*,module+,parameterize,let-values,let*-values,letrec-values,local
+setl lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case,syntax-parse
+setl lispwords+=define-signature,unit,unit/sig,compund-unit/sig,define-values/invoke-unit/sig
+setl lispwords+=define-opt/c,define-syntax-rule
+setl lispwords+=struct
+
+" Racket OOP
+setl lispwords+=class,define/public,define/private
+
+" kanren
+setl lispwords+=fresh,run,run*,project,conde,condu
+
+" loops
+setl lispwords+=for,for/list,for/fold,for*,for*/list,for*/fold,for/or,for/and
+setl lispwords+=for/hash,for/sum,for/flvector,for*/flvector,for/vector
+
+setl lispwords+=match,match*,match/values,define/match,match-lambda,match-lambda*,match-lambda**
+setl lispwords+=match-let,match-let*,match-let-values,match-let*-values
+setl lispwords+=match-letrec,match-define,match-define-values
+
+let b:undo_indent = "setl ai< si< lisp< lw<"