Merge pull request clojure-emacs#384 from arichiardi/fix-lambda

Fix bug when passing lambda to define-clojure-indent, closes clojure-emacs#383

Author: Malabarba

clojure-mode.el

@@ -1090,6 +1090,9 @@ Implementation function for `clojure--find-indent-spec'."
         (when (numberp method)
           (setq method (list method)))
         (pcase method
+          ((pred functionp)
+           (when (= pos 0)
+             method))
           ((pred sequencep)
            (pcase (length method)
              (`0 nil)
@@ -1102,9 +1105,6 @@ Implementation function for `clojure--find-indent-spec'."
           ((or `defun `:defn)
            (when (= pos 0)
              :defn))
-          ((pred functionp)
-           (when (= pos 0)
-             method))
           (_
            (message "Invalid indent spec for `%s': %s" function method)
            nil))))))

test/clojure-mode-indentation-test.el

@@ -164,6 +164,17 @@ values of customisable variables."
 (ala/bala top
   |one)")
 
+;; we can pass a lambda to explicitely set the column
+(put-clojure-indent 'arsymbol (lambda (indent-point state) 0))
+
+(check-indentation symbol-with-lambda
+  "
+(arsymbol
+ |one)"
+  "
+(arsymbol
+|one)")
+
 (check-indentation form-with-metadata
   "
 (ns ^:doc app.core