Project dir decision where lein & boot are mixed

This functionality was moved from `cider' project

Author: ajchemist

clojure-mode.el

@@ -979,17 +979,22 @@ nil."
 
 
 
-(defun clojure-project-dir ()
+(defun clojure-project-dir (dir-name)
   "Return the absolute path to the project's root directory."
-  (file-truename
-   (or (locate-dominating-file default-directory
-                               "project.clj")
-       (locate-dominating-file default-directory
-                               "build.boot"))))
+  (when dir-name
+    (let ((lein-project-dir (locate-dominating-file dir-name "project.clj"))
+          (boot-project-dir (locate-dominating-file dir-name "build.boot")))
+      (file-truename
+       (reduce #'(lambda (x y)
+                   (cond ((not x) y)
+                         ((not y) x)
+                         (t (if (file-in-directory-p x y) x y))))
+               (list lein-project-dir
+                     boot-project-dir))))))
 
 (defun clojure-project-relative-path (path)
   "Denormalize PATH by making it relative to the project root."
-  (file-relative-name path (clojure-project-dir)))
+  (file-relative-name path (clojure-project-dir default-directory)))
 
 (defun clojure-expected-ns (&optional path)
   "Return the namespace matching PATH.