Insert flavor check before project type check

Author: arichiardi

inf-clojure.el

@@ -275,13 +275,6 @@ Takes its root binding from inf-clojure-repl-default-flavor but
 can be further customized using either `setq-local` or an entry
 in `.dir-locals.el`." )
 
-(defun inf-clojure--flavor-setup ()
-  "Setup inf-clojure defcustoms depending on the choose flavor."
-  (pcase inf-clojure-repl-flavor
-    (lumo (inf-clojure--flavor-lumo-setup))
-    (clojure nil)
-    (_ (user-error "[inf-clojure] The specified flavor is not supported at the moment."))))
-
 (define-derived-mode inf-clojure-mode comint-mode "Inferior Clojure"
   "Major mode for interacting with an inferior Clojure process.
 Runs a Clojure interpreter as a subprocess of Emacs, with Clojure
@@ -391,12 +384,20 @@ Fallback to `default-directory.' if not within a project."
           ((file-exists-p "build.boot") "boot")
           (t nil))))
 
+(defun inf-clojure-flavor ()
+  "Determine the flavor of the project."
+  (pcase inf-clojure-repl-flavor
+    (lumo (inf-clojure--lumo-repl-command))
+    (_ nil)))
+
 (defun inf-clojure-cmd (project-type)
   "Determine the command `inf-clojure' needs to invoke for the PROJECT-TYPE."
-  (pcase project-type
-    ("lein" inf-clojure-lein-cmd)
-    ("boot" inf-clojure-boot-cmd)
-    (_ inf-clojure-generic-cmd)))
+  (if-let ((flavor-command (inf-clojure-flavor)))
+      flavor-command
+    (pcase project-type
+      ("lein" inf-clojure-lein-cmd)
+      ("boot" inf-clojure-boot-cmd)
+      (_ inf-clojure-generic-cmd))))
 
 (defun inf-clojure-clear-repl-buffer ()
   "Clear the REPL buffer."