[Fix #362] Define a custom option clojure-indent-style

Author: Malabarba

clojure-mode.el

@@ -95,11 +95,54 @@
   "Face used to font-lock interop method names (camelCase)."
   :package-version '(clojure-mode . "3.0.0"))
 
-(defcustom clojure-defun-style-default-indent nil
-  "When non-nil, use default indenting for functions and macros.
-Otherwise check `define-clojure-indent' and `put-clojure-indent'."
-  :type 'boolean
-  :safe 'booleanp)
+(defcustom clojure-indent-style :lisp
+  "Indentation style to use for function forms and macro forms.
+There are two cases of interest configured by this variable.
+Case (A) is when at least one function argument is on the same
+line as the function name. Case (B) is the opposite (no arguments
+are on the same line as the function name). Note that the body of
+macros is not affected by this variable, it is always indented by
+`lisp-body-indent' (default 2) spaces.
+
+Note that this variable configures the indentation of function
+forms (and function-like macros), it does not affect macros that
+already use special indentation rules.
+
+The possible values for this variable are keywords indicating how
+to indent function forms.
+
+    `:lisp' - Follow the same rules as `lisp-mode'. All args are
+    vertically aligned with the first arg in case (A), and
+    vertically aligned with the function name in case (B). For
+    instance:
+        (reduce merge
+                some-coll)
+        (reduce
+         merge
+         some-coll)
+
+    `:always-body' - All args are indented like a macro body.
+        (reduce merge
+          some-coll)
+        (reduce
+          merge
+          some-coll)
+
+    `:body-unless-same-line' - Case (A) is indented like `lisp',
+    and case (B) is indented like a macro body.
+        (reduce merge
+                some-coll)
+        (reduce
+          merge
+          some-coll)"
+  :type '(choice (const :tag "Same as `lisp-mode'" lisp)
+                 (const :tag "Indent like a macro body" always-body)
+                 (const :tag "Indent like a macro body unless first arg is on the same line"
+                        body-unless-same-line))
+  :package-version '(clojure-mode . "5.2.0"))
+
+(define-obsolete-variable-alias 'clojure-defun-style-default-indent
+  'clojure-indent-style "5.2.0")
 
 (defcustom clojure-use-backtracking-indent t
   "When non-nil, enable context sensitive indentation."